summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUGS8
-rw-r--r--README.ddtp74
-rw-r--r--apt-inst/dirstream.cc16
-rw-r--r--apt-pkg/acquire-item.cc518
-rw-r--r--apt-pkg/acquire-item.h93
-rw-r--r--apt-pkg/acquire.cc6
-rw-r--r--apt-pkg/cacheiterators.h86
-rw-r--r--apt-pkg/cdrom.cc47
-rw-r--r--apt-pkg/cdrom.h7
-rw-r--r--apt-pkg/contrib/configuration.cc26
-rw-r--r--apt-pkg/contrib/configuration.h28
-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/strutl.cc110
-rw-r--r--apt-pkg/contrib/strutl.h29
-rw-r--r--apt-pkg/deb/debindexfile.cc174
-rw-r--r--apt-pkg/deb/debindexfile.h30
-rw-r--r--apt-pkg/deb/deblistparser.cc47
-rw-r--r--apt-pkg/deb/deblistparser.h4
-rw-r--r--apt-pkg/deb/debmetaindex.cc15
-rw-r--r--apt-pkg/deb/debrecords.cc23
-rw-r--r--apt-pkg/deb/debrecords.h2
-rw-r--r--apt-pkg/indexcopy.cc183
-rw-r--r--apt-pkg/indexcopy.h13
-rw-r--r--apt-pkg/indexfile.cc60
-rw-r--r--apt-pkg/indexfile.h7
-rw-r--r--apt-pkg/init.cc8
-rw-r--r--apt-pkg/packagemanager.cc4
-rw-r--r--apt-pkg/pkgcache.cc36
-rw-r--r--apt-pkg/pkgcache.h50
-rw-r--r--apt-pkg/pkgcachegen.cc133
-rw-r--r--apt-pkg/pkgcachegen.h23
-rw-r--r--apt-pkg/pkgrecords.cc9
-rw-r--r--apt-pkg/pkgrecords.h2
-rw-r--r--apt-pkg/sourcelist.cc113
-rw-r--r--apt-pkg/sourcelist.h5
-rw-r--r--buildlib/archtable1
-rw-r--r--buildlib/podomain.mak2
-rw-r--r--buildlib/sizetable1
-rw-r--r--cmdline/apt-cache.cc100
-rw-r--r--cmdline/apt-get.cc34
-rw-r--r--configure.in2
-rw-r--r--debian/changelog96
-rw-r--r--debian/control2
-rw-r--r--doc/examples/configure-index1
-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.fr4
-rw-r--r--doc/fr/sources.list.fr.5.xml38
-rw-r--r--doc/sources.list.5.xml7
-rw-r--r--methods/gpgv.cc6
-rw-r--r--methods/http.cc48
-rw-r--r--methods/http.h5
-rw-r--r--methods/makefile7
-rw-r--r--methods/rred.cc262
-rw-r--r--po/ChangeLog105
-rw-r--r--po/LINGUAS2
-rw-r--r--po/apt-all.pot552
-rw-r--r--po/bs.po338
-rw-r--r--po/ca.po345
-rw-r--r--po/cs.po509
-rw-r--r--po/da.po420
-rw-r--r--po/de.po360
-rw-r--r--po/el.po488
-rw-r--r--po/en_GB.po1422
-rw-r--r--po/es.po351
-rw-r--r--po/eu.po396
-rw-r--r--po/fi.po344
-rw-r--r--po/fr.po418
-rw-r--r--po/gl.po1670
-rw-r--r--po/he.po338
-rw-r--r--po/hu.po344
-rw-r--r--po/it.po369
-rw-r--r--po/ja.po344
-rw-r--r--po/ko.po344
-rw-r--r--po/makefile4
-rw-r--r--po/nb.po344
-rw-r--r--po/nl.po344
-rw-r--r--po/nn.po344
-rw-r--r--po/pl.po344
-rw-r--r--po/pt.po350
-rw-r--r--po/pt_BR.po349
-rw-r--r--po/ro.po344
-rw-r--r--po/ru.po483
-rw-r--r--po/sk.po474
-rw-r--r--po/sl.po344
-rw-r--r--po/sv.po363
-rw-r--r--po/tl.po822
-rw-r--r--po/vi.po2849
-rw-r--r--po/zh_CN.po473
-rw-r--r--po/zh_TW.po344
-rw-r--r--share/debian-archive.gpgbin1303 -> 4171 bytes
94 files changed, 11468 insertions, 9191 deletions
diff --git a/BUGS b/BUGS
deleted file mode 100644
index 6bbc6f839..000000000
--- a/BUGS
+++ /dev/null
@@ -1,8 +0,0 @@
-
-DDTP problems:
---------------
-- apt-get update clean the /var/lib/apt/lists dir
- from all Translation-$index that are not in the current
- enviroment or Translations apt variable
-- there needs to be a list of locales (pt, sv, en) that need
- both language and country code to get the right file
diff --git a/README.ddtp b/README.ddtp
deleted file mode 100644
index 98f6109aa..000000000
--- a/README.ddtp
+++ /dev/null
@@ -1,74 +0,0 @@
-TODO:
-- URL-Remap for the translation files (to hack around the problem that
- they are not on any ftp server yet but only on http://ddtp.debian.org/)
-
-Here is the original announcement of the ddtp support:
-
-* To: debian-devel-announce@lists.debian.org
-* Subject: Translate files
-* From: Michael Bramer <grisu@debian.org>
-* Date: Sun, 6 Oct 2002 21:56:06 +0200
-* Mail-followup-to: debian-devel@lists.debian.org
-* Message-id: <20021006195605.GA30516@home.debsupport.de>
-* Old-return-path: <michael@home.debsupport.de>
-* User-agent: Mutt/1.3.28i
-
-Hello all
-
-After some discussion between Anthony Towns (a ftpmaster), Jason
-Gunthorpe (APT Developer) and some DDTP Coordinators we find a way to
-transfer the translated package descriptions from the archive to the
-user.
-
-The translated descriptions need to be downloadable befor any
-installation process, like the other package meta information. We
-choose a new file per languages with all translated package
-descriptions. The package system can download one or more of this
-files at 'apt-get update' time and know the translations.
-
-The new files are names 'Translate-$lang' and the file have this
-rfc822-format:
- Package: &lt;package-name&gt;
- Description-md5: &lt;the md5 checksum of the english description&gt;
- Description-$lang.$encoding: &lt;translated headline&gt;
- &lt;translated section&gt;
-
-The encoding of the Description is 'UTF-8' in all languages normal.
-The files will be located at 'debian/dists/sid/main/i18n/' on the ftp
-server (for all architecture). In addition of the plain
-'Translate-$lang' file, there will be a 'gz' and a 'bz2' version and
-in future also the new incremental format version.
-
-The &lt;the md5 checksum of the english description&gt; is the md5 checksum
-of the full english description, without the 'Description: '-tag and
-with all spaces and newlines. Look at this example:
- Description: XXX
- YYY
- .
- ZZZ
-is md5(&quot;XXX\n YYY\n .\n ZZZ\n&quot;) (perl-syntax).
-
-
-A future APT version will download one or some 'Translate-$lang'
-file(s) at 'update'-time. After this download it show a translated
-description instead of the english form, if it found a translated
-description of the package with the right md5 chechsum. The enviroment
-of the user will controlled this process (LANG, LANGUAGE, LC_MESSAGES,
-etc). With this the package system will never show a outdated
-translation.
-
-The translations come all from the DDTP. A daily process on
-ddtp.debian.org make new 'Translated-$lang' files and a script on
-ftp-master request this files and move this to the debian archive.
-Now the first files are accessable at
- <a href="http://ddtp.debian.org/pdesc/translatefiles/">http://ddtp.debian.org/pdesc/translatefiles/</a>
-
-If you found wrong translations, please read the guides on
-ddtp.debian.org, make a better translation and send this per mail to
-the DDTP server. Don't bug the package maintainer!
-
-Thanks
-Grisu
---
-Michael Bramer - a Debian Linux Developer <a href="http://www.debsupport.de">http://www.debsupport.de</a>
-PGP: finger grisu@db.debian.org -- Linux Sysadmin -- Use Debian Linux
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 75a7faa2a..86f61dd00 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -24,8 +24,6 @@
#include <apt-pkg/strutl.h>
#include <apt-pkg/fileutl.h>
#include <apt-pkg/md5.h>
-#include <apt-pkg/sha1.h>
-#include <apt-pkg/tagfile.h>
#include <apti18n.h>
@@ -33,7 +31,6 @@
#include <unistd.h>
#include <errno.h>
#include <string>
-#include <sstream>
#include <stdio.h>
/*}}}*/
@@ -134,410 +131,14 @@ void pkgAcquire::Item::Rename(string From,string To)
}
/*}}}*/
-
-// AcqDiffIndex::AcqDiffIndex - Constructor
-// ---------------------------------------------------------------------
-/* Get the DiffIndex file first and see if there are patches availabe
- * If so, create a pkgAcqIndexDiffs fetcher that will get and apply the
- * patches. If anything goes wrong in that process, it will fall back to
- * the original packages file
- */
-pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner,
- string URI,string URIDesc,string ShortDesc,
- string ExpectedMD5)
- : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5), Description(URIDesc)
-{
-
- Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
-
- Desc.Description = URIDesc + "/DiffIndex";
- Desc.Owner = this;
- Desc.ShortDesc = ShortDesc;
- Desc.URI = URI + ".diff/Index";
-
- DestFile = _config->FindDir("Dir::State::lists") + "partial/";
- DestFile += URItoFileName(URI) + string(".DiffIndex");
-
- if(Debug)
- std::clog << "pkgAcqDiffIndex: " << Desc.URI << std::endl;
-
- // look for the current package file
- CurrentPackagesFile = _config->FindDir("Dir::State::lists");
- CurrentPackagesFile += URItoFileName(RealURI);
-
- if(!FileExists(CurrentPackagesFile) ||
- !_config->FindB("Acquire::Diffs",true)) {
- // we don't have a pkg file or we don't want to queue
- if(Debug)
- std::clog << "No index file or canceld by user" << std::endl;
- Failed("", NULL);
- return;
- }
-
- if(Debug) {
- std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): "
- << CurrentPackagesFile << std::endl;
- }
-
- QueueURI(Desc);
-
-}
-
-// AcqIndex::Custom600Headers - Insert custom request headers /*{{{*/
-// ---------------------------------------------------------------------
-/* The only header we use is the last-modified header. */
-string pkgAcqDiffIndex::Custom600Headers()
-{
- string Final = _config->FindDir("Dir::State::lists");
- Final += URItoFileName(RealURI) + string(".IndexDiff");
-
- if(Debug)
- std::clog << "Custom600Header-IMS: " << Final << std::endl;
-
- struct stat Buf;
- if (stat(Final.c_str(),&Buf) != 0)
- return "\nIndex-File: true";
-
- return "\nIndex-File: true\nLast-Modified: " + TimeRFC1123(Buf.st_mtime);
-}
-
-
-bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile)
-{
- if(Debug)
- std::clog << "pkgAcqIndexDiffs::ParseIndexDiff() " << IndexDiffFile
- << std::endl;
-
- pkgTagSection Tags;
- string ServerSha1;
- vector<DiffInfo> available_patches;
-
- FileFd Fd(IndexDiffFile,FileFd::ReadOnly);
- pkgTagFile TF(&Fd);
- if (_error->PendingError() == true)
- return false;
-
- if(TF.Step(Tags) == true)
- {
- string local_sha1;
- bool found = false;
- DiffInfo d;
- string size;
-
- string tmp = Tags.FindS("SHA1-Current");
- std::stringstream ss(tmp);
- ss >> ServerSha1;
-
- FileFd fd(CurrentPackagesFile, FileFd::ReadOnly);
- SHA1Summation SHA1;
- SHA1.AddFD(fd.Fd(), fd.Size());
- local_sha1 = string(SHA1.Result());
-
- if(local_sha1 == ServerSha1) {
- if(Debug)
- std::clog << "Package file is up-to-date" << std::endl;
- // set found to true, this will queue a pkgAcqIndexDiffs with
- // a empty availabe_patches
- found = true;
- } else {
- if(Debug)
- std::clog << "SHA1-Current: " << ServerSha1 << std::endl;
-
- // check the historie and see what patches we need
- string history = Tags.FindS("SHA1-History");
- std::stringstream hist(history);
- while(hist >> d.sha1 >> size >> d.file) {
- d.size = atoi(size.c_str());
- // read until the first match is found
- if(d.sha1 == local_sha1)
- found=true;
- // from that point on, we probably need all diffs
- if(found) {
- if(Debug)
- std::clog << "Need to get diff: " << d.file << std::endl;
- available_patches.push_back(d);
- }
- }
- }
-
- // no information how to get the patches, bail out
- if(!found) {
- if(Debug)
- std::clog << "Can't find a patch in the index file" << std::endl;
- // Failed will queue a big package file
- Failed("", NULL);
- } else {
- // queue the diffs
- new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
- ExpectedMD5, available_patches);
- Complete = false;
- Status = StatDone;
- Dequeue();
- return true;
- }
- }
-
- return false;
-}
-
-void pkgAcqDiffIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
-{
- if(Debug)
- std::clog << "pkgAcqDiffIndex failed: " << Desc.URI << std::endl
- << "Falling back to normal index file aquire" << std::endl;
-
- new pkgAcqIndex(Owner, RealURI, Description, Desc.ShortDesc,
- ExpectedMD5);
-
- Complete = false;
- Status = StatDone;
- Dequeue();
-}
-
-void pkgAcqDiffIndex::Done(string Message,unsigned long Size,string Md5Hash,
- pkgAcquire::MethodConfig *Cnf)
-{
- if(Debug)
- std::clog << "pkgAcqDiffIndex::Done(): " << Desc.URI << std::endl;
-
- Item::Done(Message,Size,Md5Hash,Cnf);
-
- string FinalFile;
- FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI);
-
- // sucess in downloading the index
- // rename the index
- FinalFile += string(".IndexDiff");
- if(Debug)
- std::clog << "Renaming: " << DestFile << " -> " << FinalFile
- << std::endl;
- Rename(DestFile,FinalFile);
- chmod(FinalFile.c_str(),0644);
- DestFile = FinalFile;
-
- if(!ParseDiffIndex(DestFile))
- return Failed("", NULL);
-
- Complete = true;
- Status = StatDone;
- Dequeue();
- return;
-}
-
-
-
-// AcqIndexDiffs::AcqIndexDiffs - Constructor
-// ---------------------------------------------------------------------
-/* The package diff is added to the queue. one object is constructed
- * for each diff and the index
- */
-pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
- string URI,string URIDesc,string ShortDesc,
- string ExpectedMD5, vector<DiffInfo> diffs)
- : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5),
- available_patches(diffs)
-{
-
- DestFile = _config->FindDir("Dir::State::lists") + "partial/";
- DestFile += URItoFileName(URI);
-
- Debug = _config->FindB("Debug::pkgAcquire::Diffs",false);
-
- Desc.Description = URIDesc;
- Desc.Owner = this;
- Desc.ShortDesc = ShortDesc;
-
- if(available_patches.size() == 0) {
- // we are done (yeah!)
- Finish(true);
- } else {
- // get the next diff
- State = StateFetchDiff;
- QueueNextDiff();
- }
-}
-
-
-void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
-{
- if(Debug)
- std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl
- << "Falling back to normal index file aquire" << std::endl;
- new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc,
- ExpectedMD5);
- Finish();
-}
-
-
-// helper that cleans the item out of the fetcher queue
-void pkgAcqIndexDiffs::Finish(bool allDone)
-{
- // we restore the original name, this is required, otherwise
- // the file will be cleaned
- if(allDone) {
- DestFile = _config->FindDir("Dir::State::lists");
- DestFile += URItoFileName(RealURI);
-
- // do the final md5sum checking
- MD5Summation sum;
- FileFd Fd(DestFile, FileFd::ReadOnly);
- sum.AddFD(Fd.Fd(), Fd.Size());
- Fd.Close();
- string MD5 = (string)sum.Result();
-
- if (!ExpectedMD5.empty() && MD5 != ExpectedMD5)
- {
- Status = StatAuthError;
- ErrorText = _("MD5Sum mismatch");
- Rename(DestFile,DestFile + ".FAILED");
- Dequeue();
- return;
- }
-
- // this is for the "real" finish
- Complete = true;
- Status = StatDone;
- Dequeue();
- if(Debug)
- std::clog << "\n\nallDone: " << DestFile << "\n" << std::endl;
- return;
- }
-
- if(Debug)
- std::clog << "Finishing: " << Desc.URI << std::endl;
- Complete = false;
- Status = StatDone;
- Dequeue();
- return;
-}
-
-
-
-bool pkgAcqIndexDiffs::QueueNextDiff()
-{
-
- // calc sha1 of the just patched file
- string FinalFile = _config->FindDir("Dir::State::lists");
- FinalFile += URItoFileName(RealURI);
-
- FileFd fd(FinalFile, FileFd::ReadOnly);
- SHA1Summation SHA1;
- SHA1.AddFD(fd.Fd(), fd.Size());
- string local_sha1 = string(SHA1.Result());
- if(Debug)
- std::clog << "QueueNextDiff: "
- << FinalFile << " (" << local_sha1 << ")"<<std::endl;
-
- // remove all patches until the next matching patch is found
- // this requires the Index file to be ordered
- for(vector<DiffInfo>::iterator I=available_patches.begin();
- available_patches.size() > 0 && I != available_patches.end()
- && (*I).sha1 != local_sha1;
- I++) {
- available_patches.erase(I);
- }
-
- // error checking and falling back if no patch was found
- if(available_patches.size() == 0) {
- Failed("", NULL);
- return false;
- }
-
- // queue the right diff
- Desc.URI = string(RealURI) + ".diff/" + available_patches[0].file + ".gz";
- Desc.Description = available_patches[0].file + string(".pdiff");
-
- DestFile = _config->FindDir("Dir::State::lists") + "partial/";
- DestFile += URItoFileName(RealURI + ".diff/" + available_patches[0].file);
-
- if(Debug)
- std::clog << "pkgAcqIndexDiffs::QueueNextDiff(): " << Desc.URI << std::endl;
-
- QueueURI(Desc);
-
- return true;
-}
-
-
-
-void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,
- pkgAcquire::MethodConfig *Cnf)
-{
- if(Debug)
- std::clog << "pkgAcqIndexDiffs::Done(): " << Desc.URI << std::endl;
-
- Item::Done(Message,Size,Md5Hash,Cnf);
-
- string FinalFile;
- FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI);
-
- // sucess in downloading a diff, enter ApplyDiff state
- if(State == StateFetchDiff)
- {
-
- if(Debug)
- std::clog << "Sending to gzip method: " << FinalFile << std::endl;
-
- string FileName = LookupTag(Message,"Filename");
- State = StateUnzipDiff;
- Desc.URI = "gzip:" + FileName;
- DestFile += ".decomp";
- QueueURI(Desc);
- Mode = "gzip";
- return;
- }
-
- // sucess in downloading a diff, enter ApplyDiff state
- if(State == StateUnzipDiff)
- {
-
- // rred excepts the patch as $FinalFile.ed
- Rename(DestFile,FinalFile+".ed");
-
- if(Debug)
- std::clog << "Sending to rred method: " << FinalFile << std::endl;
-
- State = StateApplyDiff;
- Desc.URI = "rred:" + FinalFile;
- QueueURI(Desc);
- Mode = "rred";
- return;
- }
-
-
- // success in download/apply a diff, queue next (if needed)
- if(State == StateApplyDiff)
- {
- // remove the just applied patch
- available_patches.erase(available_patches.begin());
-
- // move into place
- if(Debug)
- {
- std::clog << "Moving patched file in place: " << std::endl
- << DestFile << " -> " << FinalFile << std::endl;
- }
- Rename(DestFile,FinalFile);
-
- // see if there is more to download
- if(available_patches.size() > 0) {
- new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc,
- ExpectedMD5, available_patches);
- return Finish();
- } else
- return Finish(true);
- }
-}
-
-
// AcqIndex::AcqIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* The package file is added to the queue and a second class is
instantiated to fetch the revision file */
pkgAcqIndex::pkgAcqIndex(pkgAcquire *Owner,
string URI,string URIDesc,string ShortDesc,
- string ExpectedMD5, string comprExt)
- : Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5)
+ string ExpectedMD5, string comprExt) :
+ Item(Owner), RealURI(URI), ExpectedMD5(ExpectedMD5)
{
Decompression = false;
Erase = false;
@@ -583,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
@@ -689,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";
@@ -707,35 +308,6 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string MD5,
Mode = decompProg;
}
-// AcqIndexTrans::pkgAcqIndexTrans - Constructor /*{{{*/
-// ---------------------------------------------------------------------
-/* The Translation file is added to the queue */
-pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
- string URI,string URIDesc,string ShortDesc) :
- pkgAcqIndex(Owner, URI, URIDesc, ShortDesc, "", "")
-{
-}
-
- /*}}}*/
-// AcqIndexTrans::Failed - Silence failure messages for missing files /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void pkgAcqIndexTrans::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
-{
- if (Cnf->LocalOnly == true ||
- StringToBool(LookupTag(Message,"Transient-Failure"),false) == false)
- {
- // Ignore this
- Status = StatDone;
- Complete = false;
- Dequeue();
- return;
- }
-
- Item::Failed(Message,Cnf);
-}
- /*}}}*/
-
pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
string URI,string URIDesc,string ShortDesc,
string MetaIndexURI, string MetaIndexURIDesc,
@@ -743,10 +315,9 @@ 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);
@@ -858,11 +429,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);
@@ -954,6 +523,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");
@@ -982,7 +554,7 @@ void pkgAcqMetaIndex::AuthDone(string Message)
return;
}
- if (!VerifyVendor())
+ if (!VerifyVendor(Message))
{
return;
}
@@ -1035,12 +607,12 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
}
// Queue Packages file
- new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description,
- (*Target)->ShortDesc, ExpectedIndexMD5);
+ new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description,
+ (*Target)->ShortDesc, ExpectedIndexMD5);
}
}
-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?
@@ -1065,6 +637,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();
@@ -1073,7 +661,7 @@ bool pkgAcqMetaIndex::VerifyVendor()
Transformed = "experimental";
}
- string::size_type pos = Transformed.rfind('/');
+ pos = Transformed.rfind('/');
if (pos != string::npos)
{
Transformed = Transformed.substr(0, pos);
@@ -1119,10 +707,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
@@ -1198,6 +806,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. "
@@ -1430,13 +1044,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;
@@ -1456,7 +1076,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 34fcc2a76..da1bea801 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -9,8 +9,8 @@
the Owner Acquire class. Derived classes will then call QueueURI to
register all the URI's they wish to fetch at the initial moment.
- Three item classes are provided to provide functionality for
- downloading of Index, Translation and Packages files.
+ Two item classes are provided to provide functionality for downloading
+ of Index files and downloading of Packages.
A Archive class is provided for downloading .deb files. It does Md5
checking and source location as well as a retry algorithm.
@@ -82,70 +82,6 @@ class pkgAcquire::Item
virtual ~Item();
};
-// item for index diffs
-
-struct DiffInfo {
- string file;
- string sha1;
- unsigned long size;
-};
-
-class pkgAcqDiffIndex : public pkgAcquire::Item
-{
- protected:
- bool Debug;
- pkgAcquire::ItemDesc Desc;
- string RealURI;
- string ExpectedMD5;
- string CurrentPackagesFile;
- string Description;
-
- public:
- // Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long Size,string Md5Hash,
- pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return RealURI + "Index";};
- virtual string Custom600Headers();
-
- // helpers
- bool ParseDiffIndex(string IndexDiffFile);
-
- pkgAcqDiffIndex(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesct, string ExpectedMD5);
-};
-
-class pkgAcqIndexDiffs : public pkgAcquire::Item
-{
- protected:
- bool Debug;
- pkgAcquire::ItemDesc Desc;
- string RealURI;
- string ExpectedMD5;
-
- // this is the SHA-1 sum we expect after the patching
- string Description;
- vector<DiffInfo> available_patches;
- enum {StateFetchIndex,StateFetchDiff,StateUnzipDiff,StateApplyDiff} State;
-
- public:
-
- // Specialized action members
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- virtual void Done(string Message,unsigned long Size,string Md5Hash,
- pkgAcquire::MethodConfig *Cnf);
- virtual string DescURI() {return RealURI + "Index";};
-
- // various helpers
- bool QueueNextDiff();
- bool ApplyDiff(string PatchFile);
- void Finish(bool allDone=false);
-
- pkgAcqIndexDiffs(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesct, string ExpectedMD5,
- vector<DiffInfo> diffs=vector<DiffInfo>());
-};
-
// Item class for index files
class pkgAcqIndex : public pkgAcquire::Item
{
@@ -171,16 +107,6 @@ class pkgAcqIndex : public pkgAcquire::Item
string ShortDesct, string ExpectedMD5, string compressExt="");
};
-// Item class for translated package index files
-class pkgAcqIndexTrans : public pkgAcqIndex
-{
- public:
-
- virtual void Failed(string Message,pkgAcquire::MethodConfig *Cnf);
- pkgAcqIndexTrans(pkgAcquire *Owner,string URI,string URIDesc,
- string ShortDesct);
-};
-
struct IndexTarget
{
string URI;
@@ -225,8 +151,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);
@@ -298,9 +226,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.cc b/apt-pkg/acquire.cc
index 62209e65b..57cf60bfe 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;
}
/*}}}*/
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 64fa4636e..2b326bd65 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -99,7 +99,7 @@ class pkgCache::VerIterator
{
Version *Ver;
pkgCache *Owner;
-
+
void _dummy();
public:
@@ -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
@@ -128,8 +128,6 @@ class pkgCache::VerIterator
inline const char *Section() const {return Ver->Section == 0?0:Owner->StrP + Ver->Section;};
inline const char *Arch() const {return Ver->Arch == 0?0:Owner->StrP + Ver->Arch;};
inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owner->PkgP + Ver->ParentPkg);};
- inline DescIterator DescriptionList() const;
- DescIterator TranslatedDescription() const;
inline DepIterator DependsList() const;
inline PrvIterator ProvidesList() const;
inline VerFileIterator FileList() const;
@@ -150,50 +148,6 @@ class pkgCache::VerIterator
};
};
-// Description Iterator
-class pkgCache::DescIterator
-{
- Description *Desc;
- pkgCache *Owner;
-
- void _dummy();
-
- public:
-
- // Iteration
- void operator ++(int) {if (Desc != Owner->DescP) Desc = Owner->DescP + Desc->NextDesc;};
- inline void operator ++() {operator ++(0);};
- inline bool end() const {return Desc == Owner->DescP?true:false;};
- inline void operator =(const DescIterator &B) {Desc = B.Desc; Owner = B.Owner;};
-
- // Comparison
- inline bool operator ==(const DescIterator &B) const {return Desc == B.Desc;};
- inline bool operator !=(const DescIterator &B) const {return Desc != B.Desc;};
- int CompareDesc(const DescIterator &B) const;
-
- // Accessors
- inline Description *operator ->() {return Desc;};
- inline Description const *operator ->() const {return Desc;};
- inline Description &operator *() {return *Desc;};
- inline Description const &operator *() const {return *Desc;};
- inline operator Description *() {return Desc == Owner->DescP?0:Desc;};
- inline operator Description const *() const {return Desc == Owner->DescP?0:Desc;};
- inline pkgCache *Cache() {return Owner;};
-
- inline const char *LanguageCode() const {return Owner->StrP + Desc->language_code;};
- inline const char *md5() const {return Owner->StrP + Desc->md5sum;};
- inline DescFileIterator FileList() const;
- inline unsigned long Index() const {return Desc - Owner->DescP;};
-
- inline DescIterator() : Desc(0), Owner(0) {};
- inline DescIterator(pkgCache &Owner,Description *Trg = 0) : Desc(Trg),
- Owner(&Owner)
- {
- if (Desc == 0)
- Desc = Owner.DescP;
- };
-};
-
// Dependency iterator
class pkgCache::DepIterator
{
@@ -384,38 +338,6 @@ class pkgCache::VerFileIterator
inline VerFileIterator(pkgCache &Owner,VerFile *Trg) : Owner(&Owner), FileP(Trg) {};
};
-// Description File
-class pkgCache::DescFileIterator
-{
- pkgCache *Owner;
- DescFile *FileP;
-
- public:
-
- // Iteration
- void operator ++(int) {if (FileP != Owner->DescFileP) FileP = Owner->DescFileP + FileP->NextFile;};
- inline void operator ++() {operator ++(0);};
- inline bool end() const {return FileP == Owner->DescFileP?true:false;};
-
- // Comparison
- inline bool operator ==(const DescFileIterator &B) const {return FileP == B.FileP;};
- inline bool operator !=(const DescFileIterator &B) const {return FileP != B.FileP;};
-
- // Accessors
- inline DescFile *operator ->() {return FileP;};
- inline DescFile const *operator ->() const {return FileP;};
- inline DescFile const &operator *() const {return *FileP;};
- inline operator DescFile *() {return FileP == Owner->DescFileP?0:FileP;};
- inline operator DescFile const *() const {return FileP == Owner->DescFileP?0:FileP;};
- inline pkgCache *Cache() {return Owner;};
-
- inline PkgFileIterator File() const {return PkgFileIterator(*Owner,FileP->File + Owner->PkgFileP);};
- inline unsigned long Index() const {return FileP - Owner->DescFileP;};
-
- inline DescFileIterator() : Owner(0), FileP(0) {};
- inline DescFileIterator(pkgCache &Owner,DescFile *Trg) : Owner(&Owner), FileP(Trg) {};
-};
-
// Inlined Begin functions cant be in the class because of order problems
inline pkgCache::VerIterator pkgCache::PkgIterator::VersionList() const
{return VerIterator(*Owner,Owner->VerP + Pkg->VersionList);};
@@ -425,15 +347,11 @@ inline pkgCache::DepIterator pkgCache::PkgIterator::RevDependsList() const
{return DepIterator(*Owner,Owner->DepP + Pkg->RevDepends,Pkg);};
inline pkgCache::PrvIterator pkgCache::PkgIterator::ProvidesList() const
{return PrvIterator(*Owner,Owner->ProvideP + Pkg->ProvidesList,Pkg);};
-inline pkgCache::DescIterator pkgCache::VerIterator::DescriptionList() const
- {return DescIterator(*Owner,Owner->DescP + Ver->DescriptionList);};
inline pkgCache::PrvIterator pkgCache::VerIterator::ProvidesList() const
{return PrvIterator(*Owner,Owner->ProvideP + Ver->ProvidesList,Ver);};
inline pkgCache::DepIterator pkgCache::VerIterator::DependsList() const
{return DepIterator(*Owner,Owner->DepP + Ver->DependsList,Ver);};
inline pkgCache::VerFileIterator pkgCache::VerIterator::FileList() const
{return VerFileIterator(*Owner,Owner->VerFileP + Ver->FileList);};
-inline pkgCache::DescFileIterator pkgCache::DescIterator::FileList() const
- {return DescFileIterator(*Owner,Owner->DescFileP + Desc->FileList);};
#endif
diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index b42c82dd0..ce1beb39b 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -30,16 +30,12 @@ using namespace std;
search that short circuits when it his a package file in the dir.
This speeds it up greatly as the majority of the size is in the
binary-* sub dirs. */
-bool pkgCdrom::FindPackages(string CD,
- vector<string> &List,
- vector<string> &SList,
- vector<string> &SigList,
- vector<string> &TransList,
+bool pkgCdrom::FindPackages(string CD,vector<string> &List,
+ vector<string> &SList, vector<string> &SigList,
string &InfoDir, pkgCdromStatus *log,
unsigned int Depth)
{
static ino_t Inodes[9];
- DIR *D;
// if we have a look we "pulse" now
if(log)
@@ -94,28 +90,8 @@ bool pkgCdrom::FindPackages(string CD,
if (_config->FindB("APT::CDROM::Thorough",false) == false)
return true;
}
-
- // see if we find translatin indexes
- if (stat("i18n",&Buf) == 0)
- {
- D = opendir("i18n");
- for (struct dirent *Dir = readdir(D); Dir != 0; Dir = readdir(D))
- {
- if(strstr(Dir->d_name,"Translation") != NULL)
- {
- if (_config->FindB("Debug::aptcdrom",false) == true)
- std::clog << "found translations: " << Dir->d_name << "\n";
- string file = Dir->d_name;
- if(file.substr(file.size()-3,file.size()) == ".gz")
- file = file.substr(0,file.size()-3);
- TransList.push_back(CD+"i18n/"+ file);
- }
- }
- closedir(D);
- }
-
- D = opendir(".");
+ DIR *D = opendir(".");
if (D == 0)
return _error->Errno("opendir","Unable to read %s",CD.c_str());
@@ -151,7 +127,7 @@ bool pkgCdrom::FindPackages(string CD,
Inodes[Depth] = Buf.st_ino;
// Descend
- if (FindPackages(CD + Dir->d_name,List,SList,SigList,TransList,InfoDir,log,Depth+1) == false)
+ if (FindPackages(CD + Dir->d_name,List,SList,SigList,InfoDir,log,Depth+1) == false)
break;
if (chdir(CD.c_str()) != 0)
@@ -636,10 +612,9 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
vector<string> List;
vector<string> SourceList;
vector<string> SigList;
- vector<string> TransList;
string StartDir = SafeGetCWD();
string InfoDir;
- if (FindPackages(CDROM,List,SourceList, SigList,TransList,InfoDir,log) == false)
+ if (FindPackages(CDROM,List,SourceList, SigList,InfoDir,log) == false)
{
log->Update("\n");
return false;
@@ -667,13 +642,11 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
DropRepeats(List,"Packages");
DropRepeats(SourceList,"Sources");
DropRepeats(SigList,"Release.gpg");
- DropRepeats(TransList,"");
if(log) {
msg.str("");
- ioprintf(msg, _("Found %i package indexes, %i source indexes, "
- "%i translation indexes and %i signatures\n"),
- List.size(), SourceList.size(), TransList.size(),
- SigList.size());
+ ioprintf(msg, _("Found %i package indexes, %i source indexes and "
+ "%i signatures\n"),
+ List.size(), SourceList.size(), SigList.size());
log->Update(msg.str(), STEP_SCAN);
}
@@ -763,10 +736,8 @@ bool pkgCdrom::Add(pkgCdromStatus *log)
// Copy the package files to the state directory
PackageCopy Copy;
SourceCopy SrcCopy;
- TranslationsCopy TransCopy;
if (Copy.CopyPackages(CDROM,Name,List, log) == false ||
- SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false ||
- TransCopy.CopyTranslations(CDROM,Name,TransList, log) == false)
+ SrcCopy.CopyPackages(CDROM,Name,SourceList, log) == false)
return false;
// reduce the List so that it takes less space in sources.list
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index e18aaff3e..085eb64e2 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -50,11 +50,8 @@ class pkgCdrom
};
- bool FindPackages(string CD,
- vector<string> &List,
- vector<string> &SList,
- vector<string> &SigList,
- vector<string> &TransList,
+ bool FindPackages(string CD,vector<string> &List,
+ vector<string> &SList, vector<string> &SigList,
string &InfoDir, pkgCdromStatus *log,
unsigned int Depth = 0);
bool DropBinaryArch(vector<string> &List);
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/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/strutl.cc b/apt-pkg/contrib/strutl.cc
index 303cb27db..d96155917 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -32,55 +32,12 @@
#include <regex.h>
#include <errno.h>
#include <stdarg.h>
-#include <iconv.h>
#include "config.h"
using namespace std;
/*}}}*/
-// UTF8ToCodeset - Convert some UTF-8 string for some codeset /*{{{*/
-// ---------------------------------------------------------------------
-/* This is handy to use before display some information for enduser */
-bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest)
-{
- iconv_t cd;
- const char *inbuf;
- char *inptr, *outbuf, *outptr;
- size_t insize, outsize;
-
- cd = iconv_open(codeset, "UTF-8");
- if (cd == (iconv_t)(-1)) {
- // Something went wrong
- if (errno == EINVAL)
- _error->Error("conversion from 'UTF-8' to '%s' not available",
- codeset);
- else
- perror("iconv_open");
-
- // Clean the destination string
- *dest = "";
-
- return false;
- }
-
- insize = outsize = orig.size();
- inbuf = orig.data();
- inptr = (char *)inbuf;
- outbuf = new char[insize+1];
- outptr = outbuf;
-
- iconv(cd, &inptr, &insize, &outptr, &outsize);
- *outptr = '\0';
-
- *dest = outbuf;
- delete[] outbuf;
-
- iconv_close(cd);
-
- return true;
-}
- /*}}}*/
// strstrip - Remove white space from the front and back of a string /*{{{*/
// ---------------------------------------------------------------------
/* This is handy to use when parsing a file. It also removes \n's left
@@ -242,10 +199,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 +220,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 +317,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 +348,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 +368,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 +537,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 +569,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 +735,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 +822,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 +983,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 +1006,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 +1035,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 +1067,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 +1102,7 @@ void URI::CopyFrom(string U)
// Tsk, weird.
if (InBracket == true)
{
- Host = string();
+ Host.clear();
return;
}
@@ -1159,7 +1113,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 +1168,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..6ec2b7811 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -38,30 +38,29 @@ using std::ostream;
#define APT_FORMAT2
#define APT_FORMAT3
#endif
-
-bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest);
+
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 +101,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 +113,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 +127,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/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 38ecdd16a..ff8bce85d 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -320,170 +320,6 @@ pkgCache::PkgFileIterator debPackagesIndex::FindInCache(pkgCache &Cache) const
}
/*}}}*/
-// TranslationsIndex::debTranslationsIndex - Contructor /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-debTranslationsIndex::debTranslationsIndex(string URI,string Dist,string Section) :
- pkgIndexFile(true), URI(URI), Dist(Dist), Section(Section)
-{
-}
- /*}}}*/
-// TranslationIndex::Trans* - Return the URI to the translation files /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-inline string debTranslationsIndex::IndexFile(const char *Type) const
-{
- return _config->FindDir("Dir::State::lists") + URItoFileName(IndexURI(Type));
-}
-string debTranslationsIndex::IndexURI(const char *Type) const
-{
- string Res;
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Res = URI + Dist;
- else
- Res = URI;
- }
- else
- Res = URI + "dists/" + Dist + '/' + Section +
- "/i18n/Translation-";
-
- Res += Type;
- return Res;
-}
- /*}}}*/
-// TranslationsIndex::GetIndexes - Fetch the index files /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const
-{
- if (TranslationsAvailable()) {
- string TranslationFile = "Translation-" + LanguageCode();
- new pkgAcqIndexTrans(Owner, IndexURI(LanguageCode().c_str()),
- Info(TranslationFile.c_str()),
- TranslationFile);
- }
-
- return true;
-}
- /*}}}*/
-// TranslationsIndex::Describe - Give a descriptive path to the index /*{{{*/
-// ---------------------------------------------------------------------
-/* This should help the user find the index in the sources.list and
- in the filesystem for problem solving */
-string debTranslationsIndex::Describe(bool Short) const
-{
- char S[300];
- if (Short == true)
- snprintf(S,sizeof(S),"%s",Info(TranslationFile().c_str()).c_str());
- else
- snprintf(S,sizeof(S),"%s (%s)",Info(TranslationFile().c_str()).c_str(),
- IndexFile(LanguageCode().c_str()).c_str());
- return S;
-}
- /*}}}*/
-// TranslationsIndex::Info - One liner describing the index URI /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debTranslationsIndex::Info(const char *Type) const
-{
- string Info = ::URI::SiteOnly(URI) + ' ';
- if (Dist[Dist.size() - 1] == '/')
- {
- if (Dist != "/")
- Info += Dist;
- }
- else
- Info += Dist + '/' + Section;
- Info += " ";
- Info += Type;
- return Info;
-}
- /*}}}*/
-bool debTranslationsIndex::HasPackages() const
-{
- if(!TranslationsAvailable())
- return false;
-
- return FileExists(IndexFile(LanguageCode().c_str()));
-}
-
-// TranslationsIndex::Exists - Check if the index is available /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::Exists() const
-{
- return FileExists(IndexFile(LanguageCode().c_str()));
-}
- /*}}}*/
-// TranslationsIndex::Size - Return the size of the index /*{{{*/
-// ---------------------------------------------------------------------
-/* This is really only used for progress reporting. */
-unsigned long debTranslationsIndex::Size() const
-{
- struct stat S;
- if (stat(IndexFile(LanguageCode().c_str()).c_str(),&S) != 0)
- return 0;
- return S.st_size;
-}
- /*}}}*/
-// TranslationsIndex::Merge - Load the index file into a cache /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const
-{
- // Check the translation file, if in use
- string TranslationFile = IndexFile(LanguageCode().c_str());
- if (TranslationsAvailable() && FileExists(TranslationFile))
- {
- FileFd Trans(TranslationFile,FileFd::ReadOnly);
- debListParser TransParser(&Trans);
- if (_error->PendingError() == true)
- return false;
-
- Prog.SubProgress(0, Info(TranslationFile.c_str()));
- if (Gen.SelectFile(TranslationFile,string(),*this) == false)
- return _error->Error("Problem with SelectFile %s",TranslationFile.c_str());
-
- // Store the IMS information
- pkgCache::PkgFileIterator TransFile = Gen.GetCurFile();
- struct stat TransSt;
- if (fstat(Trans.Fd(),&TransSt) != 0)
- return _error->Errno("fstat","Failed to stat");
- TransFile->Size = TransSt.st_size;
- TransFile->mtime = TransSt.st_mtime;
-
- if (Gen.MergeList(TransParser) == false)
- return _error->Error("Problem with MergeList %s",TranslationFile.c_str());
- }
-
- return true;
-}
- /*}}}*/
-// TranslationsIndex::FindInCache - Find this index /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgCache::PkgFileIterator debTranslationsIndex::FindInCache(pkgCache &Cache) const
-{
- string FileName = IndexFile(LanguageCode().c_str());
-
- pkgCache::PkgFileIterator File = Cache.FileBegin();
- for (; File.end() == false; File++)
- {
- if (FileName != File.FileName())
- continue;
-
- struct stat St;
- if (stat(File.FileName(),&St) != 0)
- return pkgCache::PkgFileIterator(Cache);
- if ((unsigned)St.st_size != File->Size || St.st_mtime != File->mtime)
- return pkgCache::PkgFileIterator(Cache);
- return File;
- }
- return File;
-}
- /*}}}*/
// StatusIndex::debStatusIndex - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -580,11 +416,6 @@ class debIFTypePkg : public pkgIndexFile::Type
};
debIFTypePkg() {Label = "Debian Package Index";};
};
-class debIFTypeTrans : public debIFTypePkg
-{
- public:
- debIFTypeTrans() {Label = "Debian Translation Index";};
-};
class debIFTypeStatus : public pkgIndexFile::Type
{
public:
@@ -597,7 +428,6 @@ class debIFTypeStatus : public pkgIndexFile::Type
};
static debIFTypeSrc _apt_Src;
static debIFTypePkg _apt_Pkg;
-static debIFTypeTrans _apt_Trans;
static debIFTypeStatus _apt_Status;
const pkgIndexFile::Type *debSourcesIndex::GetType() const
@@ -608,10 +438,6 @@ const pkgIndexFile::Type *debPackagesIndex::GetType() const
{
return &_apt_Pkg;
}
-const pkgIndexFile::Type *debTranslationsIndex::GetType() const
-{
- return &_apt_Trans;
-}
const pkgIndexFile::Type *debStatusIndex::GetType() const
{
return &_apt_Status;
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 57005222f..a1b9583a4 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -74,36 +74,6 @@ class debPackagesIndex : public pkgIndexFile
debPackagesIndex(string URI,string Dist,string Section,bool Trusted);
};
-class debTranslationsIndex : public pkgIndexFile
-{
- string URI;
- string Dist;
- string Section;
-
- string Info(const char *Type) const;
- string IndexFile(const char *Type) const;
- string IndexURI(const char *Type) const;
-
- inline string TranslationFile() const {return "Translation-" + LanguageCode();};
-
- public:
-
- virtual const Type *GetType() const;
-
- // Interface for acquire
- virtual string Describe(bool Short) const;
- virtual bool GetIndexes(pkgAcquire *Owner) const;
-
- // Interface for the Cache Generator
- virtual bool Exists() const;
- virtual bool HasPackages() const;
- virtual unsigned long Size() const;
- virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
- virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
-
- debTranslationsIndex(string URI,string Dist,string Section);
-};
-
class debSourcesIndex : public pkgIndexFile
{
string URI;
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 97553ab82..b11d2531c 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -15,7 +15,6 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/crc-16.h>
-#include <apt-pkg/md5.h>
#include <ctype.h>
@@ -118,48 +117,6 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
return true;
}
/*}}}*/
-// ListParser::Description - Return the description string /*{{{*/
-// ---------------------------------------------------------------------
-/* This is to return the string describing the package in debian
- form. If this returns the blank string then the entry is assumed to
- only describe package properties */
-string debListParser::Description()
-{
- if (DescriptionLanguage().empty())
- return Section.FindS("Description");
- else
- return Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str());
-}
- /*}}}*/
-// ListParser::DescriptionLanguage - Return the description lang string /*{{{*/
-// ---------------------------------------------------------------------
-/* This is to return the string describing the language of
- description. If this returns the blank string then the entry is
- assumed to describe original description. */
-string debListParser::DescriptionLanguage()
-{
- return Section.FindS("Description").empty() ? pkgIndexFile::LanguageCode() : "";
-}
- /*}}}*/
-// ListParser::Description - Return the description_md5 MD5SumValue /*{{{*/
-// ---------------------------------------------------------------------
-/* This is to return the md5 string to allow the check if it is the right
- description. If no Description-md5 is found in the section it will be
- calculated.
- */
-MD5SumValue debListParser::Description_md5()
-{
- string value = Section.FindS("Description-md5");
-
- if (value.empty())
- {
- MD5Summation md5;
- md5.Add((Description() + "\n").c_str());
- return md5.Result();
- } else
- return MD5SumValue(value);
-}
- /*}}}*/
// ListParser::UsePackage - Update a package structure /*{{{*/
// ---------------------------------------------------------------------
/* This is called to update the package with any new information
@@ -420,12 +377,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;
}
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 34bb29c72..3a0e0421b 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -12,7 +12,6 @@
#define PKGLIB_DEBLISTPARSER_H
#include <apt-pkg/pkgcachegen.h>
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
class debListParser : public pkgCacheGenerator::ListParser
@@ -48,9 +47,6 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual string Package();
virtual string Version();
virtual bool NewVersion(pkgCache::VerIterator Ver);
- virtual string Description();
- virtual string DescriptionLanguage();
- virtual MD5SumValue Description_md5();
virtual unsigned short VersionHash();
virtual bool UsePackage(pkgCache::PkgIterator Pkg,
pkgCache::VerIterator Ver);
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index d3b6ed957..85e5b16b3 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -157,14 +157,6 @@ bool debReleaseIndex::GetIndexes(pkgAcquire *Owner, bool GetAll) const
ComputeIndexTargets(),
new indexRecords (Dist));
- // Queue the translations
- for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin();
- I != SectionEntries.end(); I++) {
-
- debTranslationsIndex i = debTranslationsIndex(URI,Dist,(*I)->Section);
- i.GetIndexes(Owner);
- }
-
return true;
}
@@ -189,16 +181,11 @@ vector <pkgIndexFile *> *debReleaseIndex::GetIndexFiles()
Indexes = new vector <pkgIndexFile*>;
for (vector<const debSectionEntry *>::const_iterator I = SectionEntries.begin();
- I != SectionEntries.end(); I++) {
+ I != SectionEntries.end(); I++)
if ((*I)->IsSrc)
Indexes->push_back(new debSourcesIndex (URI, Dist, (*I)->Section, IsTrusted()));
else
- {
Indexes->push_back(new debPackagesIndex (URI, Dist, (*I)->Section, IsTrusted()));
- Indexes->push_back(new debTranslationsIndex(URI, Dist, (*I)->Section));
- }
- }
-
return Indexes;
}
diff --git a/apt-pkg/deb/debrecords.cc b/apt-pkg/deb/debrecords.cc
index 518988bb6..6652a6ad9 100644
--- a/apt-pkg/deb/debrecords.cc
+++ b/apt-pkg/deb/debrecords.cc
@@ -12,9 +12,7 @@
#pragma implementation "apt-pkg/debrecords.h"
#endif
#include <apt-pkg/debrecords.h>
-#include <apt-pkg/strutl.h>
#include <apt-pkg/error.h>
-#include <langinfo.h>
/*}}}*/
// RecordParser::debRecordParser - Constructor /*{{{*/
@@ -33,10 +31,6 @@ bool debRecordParser::Jump(pkgCache::VerFileIterator const &Ver)
{
return Tags.Jump(Section,Ver->Offset);
}
-bool debRecordParser::Jump(pkgCache::DescFileIterator const &Desc)
-{
- return Tags.Jump(Section,Desc->Offset);
-}
/*}}}*/
// RecordParser::FileName - Return the archive filename on the site /*{{{*/
// ---------------------------------------------------------------------
@@ -83,7 +77,7 @@ string debRecordParser::Maintainer()
/* */
string debRecordParser::ShortDesc()
{
- string Res = LongDesc();
+ string Res = Section.FindS("Description");
string::size_type Pos = Res.find('\n');
if (Pos == string::npos)
return Res;
@@ -95,20 +89,7 @@ string debRecordParser::ShortDesc()
/* */
string debRecordParser::LongDesc()
{
- string orig, dest;
- char *codeset = nl_langinfo(CODESET);
-
- if (!Section.FindS("Description").empty())
- orig = Section.FindS("Description").c_str();
- else
- orig = Section.FindS(("Description-" + pkgIndexFile::LanguageCode()).c_str()).c_str();
-
- if (strcmp(codeset,"UTF-8") != 0) {
- UTF8ToCodeset(codeset, orig, &dest);
- orig = dest;
- }
-
- return orig;
+ return Section.FindS("Description");
}
/*}}}*/
// RecordParser::SourcePkg - Return the source package name if any /*{{{*/
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 24e5aab88..efef2e588 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -19,7 +19,6 @@
#endif
#include <apt-pkg/pkgrecords.h>
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/tagfile.h>
class debRecordParser : public pkgRecords::Parser
@@ -31,7 +30,6 @@ class debRecordParser : public pkgRecords::Parser
protected:
virtual bool Jump(pkgCache::VerFileIterator const &Ver);
- virtual bool Jump(pkgCache::DescFileIterator const &Desc);
public:
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index c9dded134..1f65062f7 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -32,8 +32,6 @@
using namespace std;
-
-
// IndexCopy::CopyPackages - Copy the package files from the CD /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -514,10 +512,10 @@ bool SourceCopy::RewriteEntry(FILE *Target,string File)
fputc('\n',Target);
return true;
}
+
+
/*}}}*/
-// SigVerify::Verify - Verify a files md5sum against its metaindex /*{{{*/
-// ---------------------------------------------------------------------
-/* */
+
bool SigVerify::Verify(string prefix, string file, indexRecords *MetaIndex)
{
const indexRecords::checkSum *Record = MetaIndex->Lookup(file);
@@ -672,178 +670,3 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
return true;
}
-
-
-bool TranslationsCopy::CopyTranslations(string CDROM,string Name,vector<string> &List,
- pkgCdromStatus *log)
-{
- OpProgress *Progress = NULL;
- if (List.size() == 0)
- return true;
-
- if(log)
- Progress = log->GetOpProgress();
-
- bool Debug = _config->FindB("Debug::aptcdrom",false);
-
- // Prepare the progress indicator
- unsigned long TotalSize = 0;
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- {
- struct stat Buf;
- if (stat(string(*I).c_str(),&Buf) != 0 &&
- stat(string(*I + ".gz").c_str(),&Buf) != 0)
- return _error->Errno("stat","Stat failed for %s",
- string(*I).c_str());
- TotalSize += Buf.st_size;
- }
-
- unsigned long CurrentSize = 0;
- unsigned int NotFound = 0;
- unsigned int WrongSize = 0;
- unsigned int Packages = 0;
- for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
- {
- string OrigPath = string(*I,CDROM.length());
- unsigned long FileSize = 0;
-
- // Open the package file
- FileFd Pkg;
- if (FileExists(*I) == true)
- {
- Pkg.Open(*I,FileFd::ReadOnly);
- FileSize = Pkg.Size();
- }
- else
- {
- FileFd From(*I + ".gz",FileFd::ReadOnly);
- if (_error->PendingError() == true)
- return false;
- FileSize = From.Size();
-
- // Get a temp file
- FILE *tmp = tmpfile();
- if (tmp == 0)
- return _error->Errno("tmpfile","Unable to create a tmp file");
- Pkg.Fd(dup(fileno(tmp)));
- fclose(tmp);
-
- // Fork gzip
- pid_t Process = fork();
- if (Process < 0)
- return _error->Errno("fork","Couldn't fork gzip");
-
- // The child
- if (Process == 0)
- {
- dup2(From.Fd(),STDIN_FILENO);
- dup2(Pkg.Fd(),STDOUT_FILENO);
- SetCloseExec(STDIN_FILENO,false);
- SetCloseExec(STDOUT_FILENO,false);
-
- const char *Args[3];
- string Tmp = _config->Find("Dir::bin::gzip","gzip");
- Args[0] = Tmp.c_str();
- Args[1] = "-d";
- Args[2] = 0;
- execvp(Args[0],(char **)Args);
- exit(100);
- }
-
- // Wait for gzip to finish
- if (ExecWait(Process,_config->Find("Dir::bin::gzip","gzip").c_str(),false) == false)
- return _error->Error("gzip failed, perhaps the disk is full.");
-
- Pkg.Seek(0);
- }
- pkgTagFile Parser(&Pkg);
- if (_error->PendingError() == true)
- return false;
-
- // Open the output file
- char S[400];
- snprintf(S,sizeof(S),"cdrom:[%s]/%s",Name.c_str(),
- (*I).c_str() + CDROM.length());
- string TargetF = _config->FindDir("Dir::State::lists") + "partial/";
- TargetF += URItoFileName(S);
- if (_config->FindB("APT::CDROM::NoAct",false) == true)
- TargetF = "/dev/null";
- FileFd Target(TargetF,FileFd::WriteEmpty);
- FILE *TargetFl = fdopen(dup(Target.Fd()),"w");
- if (_error->PendingError() == true)
- return false;
- if (TargetFl == 0)
- return _error->Errno("fdopen","Failed to reopen fd");
-
- // Setup the progress meter
- if(Progress)
- Progress->OverallProgress(CurrentSize,TotalSize,FileSize,
- string("Reading Translation Indexes"));
-
- // Parse
- if(Progress)
- Progress->SubProgress(Pkg.Size());
- pkgTagSection Section;
- this->Section = &Section;
- string Prefix;
- unsigned long Hits = 0;
- unsigned long Chop = 0;
- while (Parser.Step(Section) == true)
- {
- if(Progress)
- Progress->Progress(Parser.Offset());
-
- const char *Start;
- const char *Stop;
- Section.GetSection(Start,Stop);
- fwrite(Start,Stop-Start, 1, TargetFl);
- fputc('\n',TargetFl);
-
- Packages++;
- Hits++;
- }
- fclose(TargetFl);
-
- if (Debug == true)
- cout << " Processed by using Prefix '" << Prefix << "' and chop " << Chop << endl;
-
- if (_config->FindB("APT::CDROM::NoAct",false) == false)
- {
- // Move out of the partial directory
- Target.Close();
- string FinalF = _config->FindDir("Dir::State::lists");
- FinalF += URItoFileName(S);
- if (rename(TargetF.c_str(),FinalF.c_str()) != 0)
- return _error->Errno("rename","Failed to rename");
- }
-
-
- CurrentSize += FileSize;
- }
- if(Progress)
- Progress->Done();
-
- // Some stats
- if(log) {
- stringstream msg;
- if(NotFound == 0 && WrongSize == 0)
- ioprintf(msg, _("Wrote %i records.\n"), Packages);
- else if (NotFound != 0 && WrongSize == 0)
- ioprintf(msg, _("Wrote %i records with %i missing files.\n"),
- Packages, NotFound);
- else if (NotFound == 0 && WrongSize != 0)
- ioprintf(msg, _("Wrote %i records with %i mismatched files\n"),
- Packages, WrongSize);
- if (NotFound != 0 && WrongSize != 0)
- ioprintf(msg, _("Wrote %i records with %i missing files and %i mismatched files\n"), Packages, NotFound, WrongSize);
- }
-
- if (Packages == 0)
- _error->Warning("No valid records were found.");
-
- if (NotFound + WrongSize > 10)
- _error->Warning("Alot of entries were discarded, something may be wrong.\n");
-
-
- return true;
-}
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 7778ae595..4dcb2b46d 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -70,17 +70,6 @@ class SourceCopy : public IndexCopy
public:
};
-class TranslationsCopy
-{
- protected:
- pkgTagSection *Section;
-
- public:
- bool CopyTranslations(string CDROM,string Name,vector<string> &List,
- pkgCdromStatus *log);
-};
-
-
class SigVerify
{
bool Verify(string prefix,string file, indexRecords *records);
@@ -92,6 +81,4 @@ class SigVerify
vector<string> PkgList,vector<string> SrcList);
};
-
-
#endif
diff --git a/apt-pkg/indexfile.cc b/apt-pkg/indexfile.cc
index 496e68b8b..49665161d 100644
--- a/apt-pkg/indexfile.cc
+++ b/apt-pkg/indexfile.cc
@@ -12,11 +12,8 @@
#pragma implementation "apt-pkg/indexfile.h"
#endif
-#include <apt-pkg/configuration.h>
#include <apt-pkg/indexfile.h>
#include <apt-pkg/error.h>
-
-#include <clocale>
/*}}}*/
// Global list of Item supported
@@ -70,60 +67,3 @@ string pkgIndexFile::SourceInfo(pkgSrcRecords::Parser const &Record,
return string();
}
/*}}}*/
-// IndexFile::TranslationsAvailable - Check if will use Translation /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool pkgIndexFile::TranslationsAvailable()
-{
- const string Translation = _config->Find("APT::Acquire::Translation");
-
- if (Translation.compare("none") != 0)
- return CheckLanguageCode(LanguageCode().c_str());
- else
- return false;
-}
- /*}}}*/
-// IndexFile::CheckLanguageCode - Check the Language Code /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-/* common cases: de_DE, de_DE@euro, de_DE.UTF-8, de_DE.UTF-8@euro,
- de_DE.ISO8859-1, tig_ER
- more in /etc/gdm/locale.conf
-*/
-
-bool pkgIndexFile::CheckLanguageCode(const char *Lang)
-{
- if (strlen(Lang) == 2 || (strlen(Lang) == 5 && Lang[2] == '_'))
- return true;
-
- if (strcmp(Lang,"C") != 0)
- _error->Warning("Wrong language code %s", Lang);
-
- return false;
-}
- /*}}}*/
-// IndexFile::LanguageCode - Return the Language Code /*{{{*/
-// ---------------------------------------------------------------------
-/* return the language code */
-string pkgIndexFile::LanguageCode()
-{
- const string Translation = _config->Find("APT::Acquire::Translation");
-
- if (Translation.compare("environment") == 0)
- {
- string lang = std::setlocale(LC_MESSAGES,NULL);
-
- // FIXME: this needs to be added
- // we have a mapping of the language codes that contains all the language
- // codes that need the country code as well
- // (like pt_BR, pt_PT, sv_SE, zh_*, en_*)
-
- if(lang.size() > 2)
- return lang.substr(0,2);
- else
- return lang;
- }
- else
- return Translation;
-}
- /*}}}*/
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index d5d1cf57a..61049f4bd 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -5,11 +5,10 @@
Index File - Abstraction for an index of archive/source file.
- There are 4 primary sorts of index files, all represented by this
+ There are 3 primary sorts of index files, all represented by this
class:
Binary index files
- Binary translation files
Bianry index files decribing the local system
Source index files
@@ -81,10 +80,6 @@ class pkgIndexFile
virtual bool MergeFileProvides(pkgCacheGenerator &/*Gen*/,OpProgress &/*Prog*/) const {return true;};
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
- static bool TranslationsAvailable();
- static bool CheckLanguageCode(const char *Lang);
- static string LanguageCode();
-
bool IsTrusted() const { return Trusted; };
pkgIndexFile(bool Trusted): Trusted(Trusted) {};
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 6118845e8..b47378d4a 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
@@ -64,13 +64,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
@@ -101,9 +102,6 @@ bool pkgInitConfig(Configuration &Cnf)
bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
}
#endif
-
- // Translation
- Cnf.Set("APT::Acquire::Translation", "environment");
return true;
}
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 155408bb4..4b3dd8be2 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -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;
}
@@ -634,6 +634,8 @@ pkgPackageManager::OrderResult pkgPackageManager::OrderInstall()
pkgPackageManager::OrderResult pkgPackageManager::DoInstall(int status_fd)
{
OrderResult Res = OrderInstall();
+ if(Debug)
+ std::clog << "OrderInstall() returned: " << Res << std::endl;
if (Res != Failed)
if (Go(status_fd) == false)
return Failed;
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 4452079a2..9926befe9 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -26,7 +26,6 @@
#endif
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/indexfile.h>
#include <apt-pkg/version.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
@@ -44,7 +43,6 @@
using std::string;
-
// Cache::Header::Header - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* Simply initialize the header */
@@ -54,7 +52,7 @@ pkgCache::Header::Header()
/* Whenever the structures change the major version should be bumped,
whenever the generator changes the minor version should be bumped. */
- MajorVersion = 5;
+ MajorVersion = 4;
MinorVersion = 0;
Dirty = false;
@@ -62,22 +60,17 @@ pkgCache::Header::Header()
PackageSz = sizeof(pkgCache::Package);
PackageFileSz = sizeof(pkgCache::PackageFile);
VersionSz = sizeof(pkgCache::Version);
- DescriptionSz = sizeof(pkgCache::Description);
DependencySz = sizeof(pkgCache::Dependency);
ProvidesSz = sizeof(pkgCache::Provides);
VerFileSz = sizeof(pkgCache::VerFile);
- DescFileSz = sizeof(pkgCache::DescFile);
PackageCount = 0;
VersionCount = 0;
- DescriptionCount = 0;
DependsCount = 0;
PackageFileCount = 0;
VerFileCount = 0;
- DescFileCount = 0;
ProvidesCount = 0;
MaxVerFileSize = 0;
- MaxDescFileSize = 0;
FileList = 0;
StringList = 0;
@@ -96,10 +89,8 @@ bool pkgCache::Header::CheckSizes(Header &Against) const
PackageSz == Against.PackageSz &&
PackageFileSz == Against.PackageFileSz &&
VersionSz == Against.VersionSz &&
- DescriptionSz == Against.DescriptionSz &&
DependencySz == Against.DependencySz &&
VerFileSz == Against.VerFileSz &&
- DescFileSz == Against.DescFileSz &&
ProvidesSz == Against.ProvidesSz)
return true;
return false;
@@ -124,10 +115,8 @@ bool pkgCache::ReMap()
HeaderP = (Header *)Map.Data();
PkgP = (Package *)Map.Data();
VerFileP = (VerFile *)Map.Data();
- DescFileP = (DescFile *)Map.Data();
PkgFileP = (PackageFile *)Map.Data();
VerP = (Version *)Map.Data();
- DescP = (Description *)Map.Data();
ProvideP = (Provides *)Map.Data();
DepP = (Dependency *)Map.Data();
StringItemP = (StringItem *)Map.Data();
@@ -164,7 +153,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 +173,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)];
@@ -246,11 +235,11 @@ const char *pkgCache::Priority(unsigned char Prio)
return 0;
}
/*}}}*/
+
// Bases for iterator classes /*{{{*/
void pkgCache::VerIterator::_dummy() {}
void pkgCache::DepIterator::_dummy() {}
void pkgCache::PrvIterator::_dummy() {}
-void pkgCache::DescIterator::_dummy() {}
/*}}}*/
// PkgIterator::operator ++ - Postfix incr /*{{{*/
// ---------------------------------------------------------------------
@@ -610,20 +599,3 @@ string pkgCache::PkgFileIterator::RelStr()
return Res;
}
/*}}}*/
-// VerIterator::TranslatedDescription - Return the a DescIter for locale/*{{{*/
-// ---------------------------------------------------------------------
-/* return a DescIter for the current locale or the default if none is
- * found
- */
-pkgCache::DescIterator pkgCache::VerIterator::TranslatedDescription() const
-{
- pkgCache::DescIterator DescDefault = DescriptionList();
- pkgCache::DescIterator Desc = DescDefault;
- for (; Desc.end() == false; Desc++)
- if (pkgIndexFile::LanguageCode() == Desc.LanguageCode())
- break;
- if (Desc.end() == true) Desc = DescDefault;
- return Desc;
-};
-
- /*}}}*/
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 6a54ad5ba..587d97534 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -38,30 +38,24 @@ class pkgCache
struct Package;
struct PackageFile;
struct Version;
- struct Description;
struct Provides;
struct Dependency;
struct StringItem;
struct VerFile;
- struct DescFile;
// Iterators
class PkgIterator;
class VerIterator;
- class DescIterator;
class DepIterator;
class PrvIterator;
class PkgFileIterator;
class VerFileIterator;
- class DescFileIterator;
friend class PkgIterator;
friend class VerIterator;
- friend class DescInterator;
friend class DepIterator;
friend class PrvIterator;
friend class PkgFileIterator;
friend class VerFileIterator;
- friend class DescFileIterator;
class Namespace;
@@ -95,7 +89,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:
@@ -104,10 +98,8 @@ class pkgCache
Header *HeaderP;
Package *PkgP;
VerFile *VerFileP;
- DescFile *DescFileP;
PackageFile *PkgFileP;
Version *VerP;
- Description *DescP;
Provides *ProvideP;
Dependency *DepP;
StringItem *StringItemP;
@@ -119,14 +111,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();
@@ -159,20 +151,16 @@ struct pkgCache::Header
unsigned short PackageSz;
unsigned short PackageFileSz;
unsigned short VersionSz;
- unsigned short DescriptionSz;
unsigned short DependencySz;
unsigned short ProvidesSz;
unsigned short VerFileSz;
- unsigned short DescFileSz;
// Structure counts
unsigned long PackageCount;
unsigned long VersionCount;
- unsigned long DescriptionCount;
unsigned long DependsCount;
unsigned long PackageFileCount;
unsigned long VerFileCount;
- unsigned long DescFileCount;
unsigned long ProvidesCount;
// Offsets
@@ -181,11 +169,10 @@ struct pkgCache::Header
map_ptrloc VerSysName; // StringTable
map_ptrloc Architecture; // StringTable
unsigned long MaxVerFileSize;
- unsigned long MaxDescFileSize;
/* Allocation pools, there should be one of these for each structure
excluding the header */
- DynamicMMap::Pool Pools[8];
+ DynamicMMap::Pool Pools[7];
// Rapid package name lookup
map_ptrloc HashTable[2*1048];
@@ -206,7 +193,7 @@ struct pkgCache::Package
map_ptrloc NextPackage; // Package
map_ptrloc RevDepends; // Dependency
map_ptrloc ProvidesList; // Provides
-
+
// Install/Remove/Purge etc
unsigned char SelectedState; // What
unsigned char InstState; // Flags
@@ -245,14 +232,6 @@ struct pkgCache::VerFile
unsigned short Size;
};
-struct pkgCache::DescFile
-{
- map_ptrloc File; // PackageFile
- map_ptrloc NextFile; // PkgVerFile
- map_ptrloc Offset; // File offset
- unsigned short Size;
-};
-
struct pkgCache::Version
{
map_ptrloc VerStr; // Stringtable
@@ -262,7 +241,6 @@ struct pkgCache::Version
// Lists
map_ptrloc FileList; // VerFile
map_ptrloc NextVer; // Version
- map_ptrloc DescriptionList; // Description
map_ptrloc DependsList; // Dependency
map_ptrloc ParentPkg; // Package
map_ptrloc ProvidesList; // Provides
@@ -274,22 +252,6 @@ struct pkgCache::Version
unsigned char Priority;
};
-struct pkgCache::Description
-{
- // Language Code store the description translation language code. If
- // the value has a 0 lenght then this is readed using the Package
- // file else the Translation-CODE are used.
- map_ptrloc language_code; // StringTable
- map_ptrloc md5sum; // StringTable
-
- // Linked list
- map_ptrloc FileList; // DescFile
- map_ptrloc NextDesc; // Description
- map_ptrloc ParentPkg; // Package
-
- unsigned short ID;
-};
-
struct pkgCache::Dependency
{
map_ptrloc Version; // Stringtable
@@ -337,13 +299,11 @@ class pkgCache::Namespace
typedef pkgCache::PkgIterator PkgIterator;
typedef pkgCache::VerIterator VerIterator;
- typedef pkgCache::DescIterator DescIterator;
typedef pkgCache::DepIterator DepIterator;
typedef pkgCache::PrvIterator PrvIterator;
typedef pkgCache::PkgFileIterator PkgFileIterator;
typedef pkgCache::VerFileIterator VerFileIterator;
typedef pkgCache::Version Version;
- typedef pkgCache::Description Description;
typedef pkgCache::Package Package;
typedef pkgCache::Header Header;
typedef pkgCache::Dep Dep;
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 1ba791b45..de854bee5 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -125,46 +125,16 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
string Version = List.Version();
if (Version.empty() == true)
{
- // we first process the package, then the descriptions
- // (this has the bonus that we get MMap error when we run out
- // of MMap space)
if (List.UsePackage(Pkg,pkgCache::VerIterator(Cache)) == false)
return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
PackageName.c_str());
-
- // Find the right version to write the description
- MD5SumValue CurMd5 = List.Description_md5();
- pkgCache::VerIterator Ver = Pkg.VersionList();
- map_ptrloc *LastVer = &Pkg->VersionList;
-
- for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
- {
- pkgCache::DescIterator Desc = Ver.DescriptionList();
- map_ptrloc *LastDesc = &Ver->DescriptionList;
-
- for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++)
- {
-
- if (MD5SumValue(Desc.md5()) == CurMd5)
- {
- // Add new description
- *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
- Desc->ParentPkg = Pkg.Index();
-
- if (NewFileDesc(Desc,List) == false)
- return _error->Error(_("Error occured while processing %s (NewFileDesc1)"),PackageName.c_str());
- break;
- }
- }
- }
-
continue;
}
pkgCache::VerIterator Ver = Pkg.VersionList();
- map_ptrloc *LastVer = &Pkg->VersionList;
+ map_ptrloc *Last = &Pkg->VersionList;
int Res = 1;
- for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
+ for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
{
Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
if (Res >= 0)
@@ -198,7 +168,7 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
// Skip to the end of the same version set.
if (Res == 0)
{
- for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
+ for (; Ver.end() == false; Last = &Ver->NextVer, Ver++)
{
Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
if (Res != 0)
@@ -207,10 +177,9 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
}
// Add a new version
- *LastVer = NewVersion(Ver,Version,*LastVer);
+ *Last = NewVersion(Ver,Version,*Last);
Ver->ParentPkg = Pkg.Index();
Ver->Hash = Hash;
-
if (List.NewVersion(Ver) == false)
return _error->Error(_("Error occurred while processing %s (NewVersion1)"),
PackageName.c_str());
@@ -230,21 +199,6 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
FoundFileDeps |= List.HasFileDeps();
return true;
}
-
- /* Record the Description data. Description data always exist in
- Packages and Translation-* files. */
- pkgCache::DescIterator Desc = Ver.DescriptionList();
- map_ptrloc *LastDesc = &Ver->DescriptionList;
-
- // Skip to the end of description set
- for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
-
- // Add new description
- *LastDesc = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
- Desc->ParentPkg = Pkg.Index();
-
- if (NewFileDesc(Desc,List) == false)
- return _error->Error(_("Error occured while processing %s (NewFileDesc2)"),PackageName.c_str());
}
FoundFileDeps |= List.HasFileDeps();
@@ -255,9 +209,6 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
return _error->Error(_("Wow, you exceeded the number of versions "
"this APT is capable of."));
- if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
- return _error->Error(_("Wow, you exceeded the number of descriptions "
- "this APT is capable of."));
if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
return _error->Error(_("Wow, you exceeded the number of dependencies "
"this APT is capable of."));
@@ -315,12 +266,12 @@ 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)
return true;
-
+
// Get a structure
unsigned long Package = Map.Allocate(sizeof(pkgCache::Package));
if (Package == 0)
@@ -379,7 +330,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
@@ -398,69 +349,13 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
return Version;
}
/*}}}*/
-// CacheGenerator::NewFileDesc - Create a new File<->Desc association /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool pkgCacheGenerator::NewFileDesc(pkgCache::DescIterator &Desc,
- ListParser &List)
-{
- if (CurrentFile == 0)
- return true;
-
- // Get a structure
- unsigned long DescFile = Map.Allocate(sizeof(pkgCache::DescFile));
- if (DescFile == 0)
- return 0;
-
- pkgCache::DescFileIterator DF(Cache,Cache.DescFileP + DescFile);
- DF->File = CurrentFile - Cache.PkgFileP;
-
- // Link it to the end of the list
- map_ptrloc *Last = &Desc->FileList;
- for (pkgCache::DescFileIterator D = Desc.FileList(); D.end() == false; D++)
- Last = &D->NextFile;
-
- DF->NextFile = *Last;
- *Last = DF.Index();
-
- DF->Offset = List.Offset();
- DF->Size = List.Size();
- if (Cache.HeaderP->MaxDescFileSize < DF->Size)
- Cache.HeaderP->MaxDescFileSize = DF->Size;
- Cache.HeaderP->DescFileCount++;
-
- return true;
-}
- /*}}}*/
-// CacheGenerator::NewDescription - Create a new Description /*{{{*/
-// ---------------------------------------------------------------------
-/* This puts a description structure in the linked list */
-map_ptrloc pkgCacheGenerator::NewDescription(pkgCache::DescIterator &Desc,
- const string &Lang, const MD5SumValue &md5sum,
- map_ptrloc Next)
-{
- // Get a structure
- map_ptrloc Description = Map.Allocate(sizeof(pkgCache::Description));
- if (Description == 0)
- return 0;
-
- // Fill it in
- Desc = pkgCache::DescIterator(Cache,Cache.DescP + Description);
- Desc->NextDesc = Next;
- Desc->ID = Cache.HeaderP->DescriptionCount++;
- Desc->language_code = Map.WriteString(Lang);
- Desc->md5sum = Map.WriteString(md5sum.Value());
-
- return Description;
-}
- /*}}}*/
// ListParser::NewDepends - Create a dependency element /*{{{*/
// ---------------------------------------------------------------------
/* 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 +419,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 +459,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 +543,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
@@ -685,7 +580,7 @@ static bool CheckValidity(string CacheFile, FileIterator Start,
pkgCache::PkgFileIterator File = (*Start)->FindInCache(Cache);
if (File.end() == true)
return false;
-
+
Visited[File->ID] = true;
}
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 6ab8594d9..9a729eea4 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -24,7 +24,6 @@
#endif
#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/md5.h>
class pkgSourceList;
class OpProgress;
@@ -54,19 +53,17 @@ 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);
- map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
+ unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr,unsigned long 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 +94,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:
@@ -110,9 +108,6 @@ class pkgCacheGenerator::ListParser
virtual string Package() = 0;
virtual string Version() = 0;
virtual bool NewVersion(pkgCache::VerIterator Ver) = 0;
- virtual string Description() = 0;
- virtual string DescriptionLanguage() = 0;
- virtual MD5SumValue Description_md5() = 0;
virtual unsigned short VersionHash() = 0;
virtual bool UsePackage(pkgCache::PkgIterator Pkg,
pkgCache::VerIterator Ver) = 0;
diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index b22f3e73f..9c2655d6a 100644
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -63,12 +63,3 @@ pkgRecords::Parser &pkgRecords::Lookup(pkgCache::VerFileIterator const &Ver)
return *Files[Ver.File()->ID];
}
/*}}}*/
-// Records::Lookup - Get a parser for the package description file /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-pkgRecords::Parser &pkgRecords::Lookup(pkgCache::DescFileIterator const &Desc)
-{
- Files[Desc.File()->ID]->Jump(Desc);
- return *Files[Desc.File()->ID];
-}
- /*}}}*/
diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 31c444dbf..08f004414 100644
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -38,7 +38,6 @@ class pkgRecords
// Lookup function
Parser &Lookup(pkgCache::VerFileIterator const &Ver);
- Parser &Lookup(pkgCache::DescFileIterator const &Desc);
// Construct destruct
pkgRecords(pkgCache &Cache);
@@ -50,7 +49,6 @@ class pkgRecords::Parser
protected:
virtual bool Jump(pkgCache::VerFileIterator const &Ver) = 0;
- virtual bool Jump(pkgCache::DescFileIterator const &Desc) = 0;
public:
friend class pkgRecords;
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/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/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..0014563b8 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -71,12 +71,6 @@ void LocalitySort(pkgCache::VerFile **begin,
{
qsort(begin,Count,Size,LocalityCompare);
}
-
-void LocalitySort(pkgCache::DescFile **begin,
- unsigned long Count,size_t Size)
-{
- qsort(begin,Count,Size,LocalityCompare);
-}
/*}}}*/
// UnMet - Show unmet dependencies /*{{{*/
// ---------------------------------------------------------------------
@@ -188,14 +182,7 @@ bool DumpPackage(CommandLine &CmdL)
{
cout << Cur.VerStr();
for (pkgCache::VerFileIterator Vf = Cur.FileList(); Vf.end() == false; Vf++)
- cout << " (" << Vf.File().FileName() << ")";
- cout << endl;
- for (pkgCache::DescIterator D = Cur.DescriptionList(); D.end() == false; D++)
- {
- cout << " Description Language: " << D.LanguageCode() << endl
- << " File: " << D.FileList().File().FileName() << endl
- << " MD5: " << D.md5() << endl;
- }
+ cout << "(" << Vf.File().FileName() << ")";
cout << endl;
}
@@ -290,15 +277,11 @@ bool Stats(CommandLine &Cmd)
cout << _("Total distinct versions: ") << Cache.Head().VersionCount << " (" <<
SizeToStr(Cache.Head().VersionCount*Cache.Head().VersionSz) << ')' << endl;
- cout << _("Total Distinct Descriptions: ") << Cache.Head().DescriptionCount << " (" <<
- SizeToStr(Cache.Head().DescriptionCount*Cache.Head().DescriptionSz) << ')' << endl;
cout << _("Total dependencies: ") << Cache.Head().DependsCount << " (" <<
SizeToStr(Cache.Head().DependsCount*Cache.Head().DependencySz) << ')' << endl;
cout << _("Total ver/file relations: ") << Cache.Head().VerFileCount << " (" <<
SizeToStr(Cache.Head().VerFileCount*Cache.Head().VerFileSz) << ')' << endl;
- cout << _("Total Desc/File relations: ") << Cache.Head().DescFileCount << " (" <<
- SizeToStr(Cache.Head().DescFileCount*Cache.Head().DescFileSz) << ')' << endl;
cout << _("Total Provides mappings: ") << Cache.Head().ProvidesCount << " (" <<
SizeToStr(Cache.Head().ProvidesCount*Cache.Head().ProvidesSz) << ')' << endl;
@@ -361,12 +344,6 @@ bool Dump(CommandLine &Cmd)
for (pkgCache::DepIterator D = V.DependsList(); D.end() == false; D++)
cout << " Depends: " << D.TargetPkg().Name() << ' ' <<
DeNull(D.TargetVer()) << endl;
- for (pkgCache::DescIterator D = V.DescriptionList(); D.end() == false; D++)
- {
- cout << " Description Language: " << D.LanguageCode() << endl
- << " File: " << D.FileList().File().FileName() << endl
- << " MD5: " << D.md5() << endl;
- }
}
}
@@ -1215,50 +1192,17 @@ bool DisplayRecord(pkgCache::VerIterator V)
if (_error->PendingError() == true)
return false;
- // Read the record
+ // Read the record and then write it out again.
unsigned char *Buffer = new unsigned char[GCache->HeaderP->MaxVerFileSize+1];
Buffer[V.FileList()->Size] = '\n';
if (PkgF.Seek(V.FileList()->Offset) == false ||
- PkgF.Read(Buffer,V.FileList()->Size) == false)
- {
- delete [] Buffer;
- return false;
- }
-
- // Get a pointer to start of Description field
- const unsigned char *DescP = (unsigned char*)strstr((char*)Buffer, "Description:");
-
- // Write all but Description
- if (fwrite(Buffer,1,DescP - Buffer,stdout) < (size_t)(DescP - Buffer))
+ PkgF.Read(Buffer,V.FileList()->Size) == false ||
+ fwrite(Buffer,1,V.FileList()->Size+1,stdout) < (size_t)(V.FileList()->Size+1))
{
delete [] Buffer;
return false;
}
-
- // Show the right description
- pkgRecords Recs(*GCache);
- pkgCache::DescIterator Desc = V.TranslatedDescription();
- pkgRecords::Parser &P = Recs.Lookup(Desc.FileList());
- cout << "Description" << ( (strcmp(Desc.LanguageCode(),"") != 0) ? "-" : "" ) << Desc.LanguageCode() << ": " << P.LongDesc();
-
- // Find the first field after the description (if there is any)
- for(DescP++;DescP != &Buffer[V.FileList()->Size];DescP++)
- {
- if(*DescP == '\n' && *(DescP+1) != ' ')
- {
- // write the rest of the buffer
- const unsigned char *end=&Buffer[V.FileList()->Size];
- if (fwrite(DescP,1,end-DescP,stdout) < (size_t)(end-DescP))
- {
- delete [] Buffer;
- return false;
- }
-
- break;
- }
- }
- // write a final newline (after the description)
- cout<<endl;
+
delete [] Buffer;
return true;
@@ -1267,9 +1211,9 @@ bool DisplayRecord(pkgCache::VerIterator V)
// Search - Perform a search /*{{{*/
// ---------------------------------------------------------------------
/* This searches the package names and pacakge descriptions for a pattern */
-struct ExDescFile
+struct ExVerFile
{
- pkgCache::DescFile *Df;
+ pkgCache::VerFile *Vf;
bool NameMatch;
};
@@ -1309,35 +1253,35 @@ bool Search(CommandLine &CmdL)
return false;
}
- ExDescFile *DFList = new ExDescFile[Cache.HeaderP->PackageCount+1];
- memset(DFList,0,sizeof(*DFList)*Cache.HeaderP->PackageCount+1);
+ ExVerFile *VFList = new ExVerFile[Cache.HeaderP->PackageCount+1];
+ memset(VFList,0,sizeof(*VFList)*Cache.HeaderP->PackageCount+1);
// Map versions that we want to write out onto the VerList array.
for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
{
- DFList[P->ID].NameMatch = NumPatterns != 0;
+ VFList[P->ID].NameMatch = NumPatterns != 0;
for (unsigned I = 0; I != NumPatterns; I++)
{
if (regexec(&Patterns[I],P.Name(),0,0,0) == 0)
- DFList[P->ID].NameMatch &= true;
+ VFList[P->ID].NameMatch &= true;
else
- DFList[P->ID].NameMatch = false;
+ VFList[P->ID].NameMatch = false;
}
// Doing names only, drop any that dont match..
- if (NamesOnly == true && DFList[P->ID].NameMatch == false)
+ if (NamesOnly == true && VFList[P->ID].NameMatch == false)
continue;
// Find the proper version to use.
pkgCache::VerIterator V = Plcy.GetCandidateVer(P);
if (V.end() == false)
- DFList[P->ID].Df = V.DescriptionList().FileList();
+ VFList[P->ID].Vf = V.FileList();
}
// Include all the packages that provide matching names too
for (pkgCache::PkgIterator P = Cache.PkgBegin(); P.end() == false; P++)
{
- if (DFList[P->ID].NameMatch == false)
+ if (VFList[P->ID].NameMatch == false)
continue;
for (pkgCache::PrvIterator Prv = P.ProvidesList() ; Prv.end() == false; Prv++)
@@ -1345,18 +1289,18 @@ bool Search(CommandLine &CmdL)
pkgCache::VerIterator V = Plcy.GetCandidateVer(Prv.OwnerPkg());
if (V.end() == false)
{
- DFList[Prv.OwnerPkg()->ID].Df = V.DescriptionList().FileList();
- DFList[Prv.OwnerPkg()->ID].NameMatch = true;
+ VFList[Prv.OwnerPkg()->ID].Vf = V.FileList();
+ VFList[Prv.OwnerPkg()->ID].NameMatch = true;
}
}
}
-
- LocalitySort(&DFList->Df,Cache.HeaderP->PackageCount,sizeof(*DFList));
+
+ LocalitySort(&VFList->Vf,Cache.HeaderP->PackageCount,sizeof(*VFList));
// Iterate over all the version records and check them
- for (ExDescFile *J = DFList; J->Df != 0; J++)
+ for (ExVerFile *J = VFList; J->Vf != 0; J++)
{
- pkgRecords::Parser &P = Recs.Lookup(pkgCache::DescFileIterator(Cache,J->Df));
+ pkgRecords::Parser &P = Recs.Lookup(pkgCache::VerFileIterator(Cache,J->Vf));
bool Match = true;
if (J->NameMatch == false)
@@ -1387,7 +1331,7 @@ bool Search(CommandLine &CmdL)
}
}
- delete [] DFList;
+ delete [] VFList;
for (unsigned I = 0; I != NumPatterns; I++)
regfree(&Patterns[I]);
if (ferror(stdout))
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 040f670b1..abeb57c6f 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>
@@ -1200,7 +1202,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
@@ -1211,10 +1213,6 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
VF++)
{
- // extra paranioa
- if(VF.File() == NULL)
- continue;
-
/* If this is the status file, and the current version is not the
version in the status file (ie it is not installed, or somesuch)
then it is not a candidate for installation, ever. This weeds
@@ -1903,6 +1901,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++)
@@ -1939,7 +1940,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);
diff --git a/configure.in b/configure.in
index 5ac3b0d8a..0d80e5ed9 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.42.1exp1")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.43.2")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/changelog b/debian/changelog
index 67195fc7e..020fe9813 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,91 @@
-apt (0.6.42.1exp1) experimental; urgency=low
-
- * added support for package index diffs
- * added support for i18n of the package descriptions
- * synced with the apt--debian-sid--0 branch
- * build from mvo@debian.org--2005/apt--debian-experimental--0
- (from http://people.debian.org/~mvo/arch)
- * fix bug in apt-cache when displaying the record (closes: #334887)
+apt (0.6.43.2) unstable; 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)
+
+ -- 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.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> Wed, 19 Oct 2005 22:12:13 +0200
+ -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +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
@@ -54,7 +129,7 @@ apt (0.6.42) unstable; urgency=low
* 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
@@ -139,7 +214,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
diff --git a/debian/control b/debian/control
index 4aa7b5aa2..5c76a90eb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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)
+Build-Depends: debhelper (>= 4.1.62), libdb4.3-dev, gettext (>= 0.12)
Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
Package: apt
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index a93b74349..9e851d753 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -117,6 +117,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
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 zro aprs une opration normale, le dcimal 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 cls</refpurpose>
</refnamediv>
<!-- Arguments -->
@@ -103,7 +103,7 @@ Debian et supprimer les cls qui sont primes.
<varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>
</term>
- <listitem><para>>Trousseau des cls fiables supprimes de l'archive Debian.</para></listitem>
+ <listitem><para>Trousseau des cls fiables supprimes de l'archive Debian.</para></listitem>
</varlistentry>
</variablelist>
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 81130d9ef..94398bb44 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -188,8 +188,8 @@
<!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>
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, utilise 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 systme de distribution de paquets utilis. Pour l'instant, cette page
de manuel ne documente que le systme d'empaquetage utilis par le systme
-Debian GNU/Linux. Ce fichier de contrle est situ dans
-<filename>/etc/apt/sources.list</filename>.
+Debian GNU/Linux. Ce fichier de contrle est <filename>/etc/apt/sources.list</filename>.
</para>
<para>
La liste des sources est conue pour prendre en compte un nombre quelconque
@@ -49,17 +48,26 @@ ligne peut tre un commentaire commenant par un caractre #.
</para>
</refsect1>
+<refsect1><title>sources.list.d</title>
+<para> Le rpertoire <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 mme 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> dcrit 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>
-dcrit 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> dcrit le
code source pour une distribution Debian dans le mme format que le type
<literal>deb</literal>. Une ligne <literal>deb-src</literal> est ncessaire pour rcuprer les
-index de sources.
+index des sources.
</para>
<para>
Le format d'une entre 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 particulire de
l'archive dcrite par cet URI est intressante. 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
prsent.
</para>
<para>
@@ -101,8 +109,8 @@ efficacement parti des sites faible bande passante.
<para>
Il est important d'indiquer les sources par ordre de prfrence,
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 htes d'un
-rseau local, puis les htes Internet distants.
+rapide la plus lente&nbsp;; par exemple, un cdrom suivi par les htes d'un
+rseau local, puis les htes 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 procd <literal>cdrom</literal> permet l'utilisation d'un lecteur de CDROM local
+Le procd <literal>cdrom</literal> permet l'utilisation d'un lecteur de cdrom
avec la possibilit de changer de media. Utilisez le programme &apt-cdrom;
-pour crer des entres dans la liste de sources.
+pour crer des entres dans la liste des sources.
</para>
</listitem>
</varlistentry>
@@ -149,8 +157,8 @@ mthode d'authentification peu sre.
<varlistentry><term>ftp</term>
<listitem><para>
Le procd <literal>ftp</literal> indique un serveur FTP comme archive. Le
-fonctionnement en mode ftp est grandement configurable&nbsp;; rfrez-vous
- la page de manuel de &apt-cdrom; pour davantage de renseignements. On
+fonctionnement en mode ftp est largement configurable&nbsp;; rfrez-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 spcifier un mandataire http
(les serveurs mandataires http comprennent souvent les URL ftp) en utilisant
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index bde9893bf..9762005b0 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,
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 5cb154f66..a114ad797 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -247,7 +247,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 dbf2d1b43..341de94e3 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -59,6 +59,11 @@ 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 /*{{{*/
// ---------------------------------------------------------------------
/* */
@@ -66,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 /*{{{*/
@@ -91,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)
@@ -783,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;
@@ -811,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 d0b5a28c0..1e3b1ef85 100644
--- a/methods/makefile
+++ b/methods/makefile
@@ -59,13 +59,6 @@ LIB_MAKES = apt-pkg/makefile
SOURCE = ftp.cc rfc2553emu.cc connect.cc
include $(PROGRAM_H)
-# The rred method
-PROGRAM=rred
-SLIBS = -lapt-pkg $(SOCKETLIBS)
-LIB_MAKES = apt-pkg/makefile
-SOURCE = rred.cc
-include $(PROGRAM_H)
-
# The rsh method
PROGRAM=rsh
SLIBS = -lapt-pkg
diff --git a/methods/rred.cc b/methods/rred.cc
deleted file mode 100644
index 6fa57f3a6..000000000
--- a/methods/rred.cc
+++ /dev/null
@@ -1,262 +0,0 @@
-#include <apt-pkg/fileutl.h>
-#include <apt-pkg/error.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/strutl.h>
-#include <apt-pkg/hashes.h>
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <utime.h>
-#include <stdio.h>
-#include <errno.h>
-#include <apti18n.h>
-
-/* this method implements a patch functionality similar to "patch --ed" that is
- * used by the "tiffany" incremental packages download stuff. it differs from
- * "ed" insofar that it is way more restricted (and therefore secure). in the
- * moment only the "c", "a" and "d" commands of ed are implemented (diff
- * doesn't output any other). additionally the records must be reverse sorted
- * by line number and may not overlap (diff *seems* to produce this kind of
- * output).
- * */
-
-const char *Prog;
-
-class RredMethod : public pkgAcqMethod
-{
- bool Debug;
- // the size of this doesn't really matter (except for performance)
- const static int BUF_SIZE = 1024;
- // the ed commands
- enum Mode {MODE_CHANGED, MODE_DELETED, MODE_ADDED};
- // return values
- enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE};
- // this applies a single hunk, it uses a tail recursion to
- // reverse the hunks in the file
- int ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line,
- char *buffer, unsigned int bufsize, Hashes *hash);
- // apply a patch file
- int ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file, Hashes *hash);
- // the methods main method
- virtual bool Fetch(FetchItem *Itm);
-
- public:
-
- RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
-};
-
-int RredMethod::ed_rec(FILE *ed_cmds, FILE *in_file, FILE *out_file, int line,
- char *buffer, unsigned int bufsize, Hashes *hash) {
- int pos;
- int startline;
- int stopline;
- int mode;
- int written;
- char *idx;
-
- /* get the current command and parse it*/
- if (fgets(buffer, bufsize, ed_cmds) == NULL) {
- return line;
- }
- startline = strtol(buffer, &idx, 10);
- if (startline < line) {
- return ED_ORDERING;
- }
- if (*idx == ',') {
- idx++;
- stopline = strtol(idx, &idx, 10);
- }
- else {
- stopline = startline;
- }
- if (*idx == 'c') {
- mode = MODE_CHANGED;
- if (Debug == true) {
- std::clog << "changing from line " << startline
- << " to " << stopline << std::endl;
- }
- }
- else if (*idx == 'a') {
- mode = MODE_ADDED;
- if (Debug == true) {
- std::clog << "adding after line " << startline << std::endl;
- }
- }
- else if (*idx == 'd') {
- mode = MODE_DELETED;
- if (Debug == true) {
- std::clog << "deleting from line " << startline
- << " to " << stopline << std::endl;
- }
- }
- else {
- return ED_PARSER;
- }
- /* get the current position */
- pos = ftell(ed_cmds);
- /* if this is add or change then go to the next full stop */
- if ((mode == MODE_CHANGED) || (mode == MODE_ADDED)) {
- do {
- fgets(buffer, bufsize, ed_cmds);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, ed_cmds);
- buffer[0] = ' ';
- }
- } while (strncmp(buffer, ".", 1) != 0);
- }
- /* do the recursive call */
- line = ed_rec(ed_cmds, in_file, out_file, line, buffer, bufsize,
- hash);
- /* pass on errors */
- if (line < 0) {
- return line;
- }
- /* apply our hunk */
- fseek(ed_cmds, pos, SEEK_SET);
- /* first wind to the current position */
- if (mode != MODE_ADDED) {
- startline -= 1;
- }
- while (line < startline) {
- fgets(buffer, bufsize, in_file);
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, in_file);
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- }
- line++;
- }
- /* include from ed script */
- if ((mode == MODE_ADDED) || (mode == MODE_CHANGED)) {
- do {
- fgets(buffer, bufsize, ed_cmds);
- if (strncmp(buffer, ".", 1) != 0) {
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, ed_cmds);
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- }
- }
- else {
- break;
- }
- } while (1);
- }
- /* ignore the corresponding number of lines from input */
- if ((mode == MODE_DELETED) || (mode == MODE_CHANGED)) {
- while (line < stopline) {
- fgets(buffer, bufsize, in_file);
- while ((strlen(buffer) == (bufsize - 1))
- && (buffer[bufsize - 2] != '\n')) {
- fgets(buffer, bufsize, in_file);
- }
- line++;
- }
- }
- return line;
-}
-
-int RredMethod::ed_file(FILE *ed_cmds, FILE *in_file, FILE *out_file,
- Hashes *hash) {
- char buffer[BUF_SIZE];
- int result;
- int written;
-
- /* we do a tail recursion to read the commands in the right order */
- result = ed_rec(ed_cmds, in_file, out_file, 0, buffer, BUF_SIZE,
- hash);
-
- /* read the rest from infile */
- if (result > 0) {
- while (fgets(buffer, BUF_SIZE, in_file) != NULL) {
- written = fwrite(buffer, 1, strlen(buffer), out_file);
- hash->Add((unsigned char*)buffer, written);
- }
- }
- else {
- return ED_FAILURE;
- }
- return ED_OK;
-}
-
-
-bool RredMethod::Fetch(FetchItem *Itm)
-{
- Debug = _config->FindB("Debug::pkgAcquire::RRed",false);
- URI Get = Itm->Uri;
- string Path = Get.Host + Get.Path; // To account for relative paths
- // Path contains the filename to patch
- FetchResult Res;
- Res.Filename = Itm->DestFile;
- URIStart(Res);
- // Res.Filename the destination filename
-
- if (Debug == true)
- std::clog << "Patching " << Path << " with " << Path
- << ".ed and putting result into " << Itm->DestFile << std::endl;
- // Open the source and destination files (the d'tor of FileFd will do
- // the cleanup/closing of the fds)
- FileFd From(Path,FileFd::ReadOnly);
- FileFd Patch(Path+".ed",FileFd::ReadOnly);
- FileFd To(Itm->DestFile,FileFd::WriteEmpty);
- To.EraseOnFailure();
- if (_error->PendingError() == true)
- return false;
-
- Hashes Hash;
- FILE* fFrom = fdopen(From.Fd(), "r");
- FILE* fPatch = fdopen(Patch.Fd(), "r");
- FILE* fTo = fdopen(To.Fd(), "w");
- // now do the actual patching
- if (ed_file(fPatch, fFrom, fTo, &Hash) != ED_OK) {
- _error->Errno("rred", _("Could not patch file"));
- return false;
- }
-
- // write out the result
- fflush(fFrom);
- fflush(fPatch);
- fflush(fTo);
- From.Close();
- Patch.Close();
- To.Close();
-
- // Transfer the modification times
- struct stat Buf;
- if (stat(Path.c_str(),&Buf) != 0)
- return _error->Errno("stat",_("Failed to stat"));
-
- struct utimbuf TimeBuf;
- TimeBuf.actime = Buf.st_atime;
- TimeBuf.modtime = Buf.st_mtime;
- if (utime(Itm->DestFile.c_str(),&TimeBuf) != 0)
- return _error->Errno("utime",_("Failed to set modification time"));
-
- if (stat(Itm->DestFile.c_str(),&Buf) != 0)
- return _error->Errno("stat",_("Failed to stat"));
-
- // return done
- Res.LastModified = Buf.st_mtime;
- Res.Size = Buf.st_size;
- Res.TakeHashes(Hash);
- URIDone(Res);
-
- return true;
-}
-
-int main(int argc, char *argv[])
-{
- RredMethod Mth;
-
- Prog = strrchr(argv[0],'/');
- Prog++;
-
- return Mth.Run();
-}
diff --git a/po/ChangeLog b/po/ChangeLog
new file mode 100644
index 000000000..068f614d3
--- /dev/null
+++ b/po/ChangeLog
@@ -0,0 +1,105 @@
+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..5e7fabb43 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
+bs ca cs 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 541a90df4..0293026c4 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-10-17 19:31+0200\n"
+"POT-Creation-Date: 2006-01-04 18:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,153 +15,145 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:141
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: 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 ""
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232
msgid "Total package names : "
msgstr ""
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:272
msgid " Normal packages: "
msgstr ""
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:273
msgid " Pure virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:274
msgid " Single virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:275
msgid " Mixed virtual packages: "
msgstr ""
-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr ""
-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:278
msgid "Total distinct versions: "
msgstr ""
-#: cmdline/apt-cache.cc:293
-msgid "Total Distinct Descriptions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280
msgid "Total dependencies: "
msgstr ""
-#: cmdline/apt-cache.cc:298
+#: cmdline/apt-cache.cc:283
msgid "Total ver/file relations: "
msgstr ""
-#: cmdline/apt-cache.cc:300
-msgid "Total Desc/File relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285
msgid "Total Provides mappings: "
msgstr ""
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:297
msgid "Total globbed strings: "
msgstr ""
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:311
msgid "Total dependency version space: "
msgstr ""
-#: cmdline/apt-cache.cc:333
+#: cmdline/apt-cache.cc:316
msgid "Total slack space: "
msgstr ""
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:324
msgid "Total space accounted for: "
msgstr ""
-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr ""
-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr ""
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462
msgid "Package files:"
msgstr ""
-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: 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:1532
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1482
msgid "Pinned packages:"
msgstr ""
-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr ""
#. Installed version
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr ""
-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr ""
#. Candidate Version
-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr ""
-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1532
msgid " Package pin: "
msgstr ""
#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1541
msgid " Version table:"
msgstr ""
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr ""
-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: 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 ""
-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1658
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -200,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 ""
@@ -239,7 +243,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#, c-format
msgid "Unable to write to %s"
msgstr ""
@@ -422,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 ""
@@ -527,221 +531,221 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr ""
-#: 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 ""
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr ""
-#: 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 ""
-#: cmdline/apt-get.cc:544
+#: 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 ""
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: 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 ""
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr ""
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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 ""
-#: 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 ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: 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 ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, 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: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"
@@ -749,74 +753,74 @@ 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
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: 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"
@@ -824,79 +828,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"
@@ -904,158 +908,163 @@ 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
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: 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"
@@ -1256,7 +1265,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 ""
@@ -1309,7 +1318,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 ""
@@ -1339,9 +1349,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:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: 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 ""
@@ -1474,12 +1484,11 @@ msgid "File not found"
msgstr ""
#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr ""
#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
msgid "Failed to set modification time"
msgstr ""
@@ -1605,7 +1614,7 @@ msgstr ""
msgid "Unable to accept connection"
msgstr ""
-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr ""
@@ -1735,76 +1744,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:345
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr ""
-#: methods/http.cc:491
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr ""
-#: methods/http.cc:499
+#: methods/http.cc:535
msgid "Bad header line"
msgstr ""
-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:554 methods/http.cc:561
msgid "The HTTP server sent an invalid reply header"
msgstr ""
-#: methods/http.cc:554
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr ""
-#: methods/http.cc:569
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr ""
-#: methods/http.cc:571
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr ""
-#: methods/http.cc:595
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr ""
-#: methods/http.cc:742
+#: methods/http.cc:778
msgid "Select failed"
msgstr ""
-#: methods/http.cc:747
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr ""
-#: methods/http.cc:770
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr ""
-#: methods/http.cc:798
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr ""
-#: methods/http.cc:823
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr ""
-#: methods/http.cc:837
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr ""
-#: methods/http.cc:839
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr ""
-#: methods/http.cc:1070
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr ""
-#: methods/http.cc:1087
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr ""
-#: methods/http.cc:1178
+#: methods/http.cc:1220
msgid "Internal error"
msgstr ""
@@ -1817,7 +1826,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr ""
@@ -1938,7 +1947,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 ""
@@ -2014,72 +2023,72 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
-#: apt-pkg/pkgcache.cc:135
+#: apt-pkg/pkgcache.cc:126
msgid "Empty package cache"
msgstr ""
-#: apt-pkg/pkgcache.cc:141
+#: apt-pkg/pkgcache.cc:132
msgid "The package cache file is corrupted"
msgstr ""
-#: apt-pkg/pkgcache.cc:146
+#: apt-pkg/pkgcache.cc:137
msgid "The package cache file is an incompatible version"
msgstr ""
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:142
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:147
msgid "The package cache was built for a different architecture"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Depends"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "PreDepends"
msgstr ""
-#: apt-pkg/pkgcache.cc:227
+#: apt-pkg/pkgcache.cc:218
msgid "Suggests"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Recommends"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Conflicts"
msgstr ""
-#: apt-pkg/pkgcache.cc:228
+#: apt-pkg/pkgcache.cc:219
msgid "Replaces"
msgstr ""
-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:220
msgid "Obsoletes"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "important"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "required"
msgstr ""
-#: apt-pkg/pkgcache.cc:240
+#: apt-pkg/pkgcache.cc:231
msgid "standard"
msgstr ""
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "optional"
msgstr ""
-#: apt-pkg/pkgcache.cc:241
+#: apt-pkg/pkgcache.cc:232
msgid "extra"
msgstr ""
@@ -2105,52 +2114,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:450
+#: 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 ""
@@ -2194,7 +2203,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 ""
@@ -2214,12 +2223,12 @@ msgstr ""
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@@ -2262,121 +2271,106 @@ msgstr ""
msgid "Error occurred while processing %s (NewPackage)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:155
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:215
+#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:219
+#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:223
+#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:247
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:256
+#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:259
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:262
+#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-#: apt-pkg/pkgcachegen.cc:290
+#: apt-pkg/pkgcachegen.cc:241
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:309
+#: apt-pkg/pkgcachegen.cc:260
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:679
+#: apt-pkg/pkgcachegen.cc:574
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
msgstr ""
-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
msgstr ""
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:126
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr ""
-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
msgid "MD5Sum mismatch"
msgstr ""
-#: apt-pkg/acquire-item.cc:1150
+#: 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:1203
+#: 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:1239
+#: 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:1326
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr ""
@@ -2385,94 +2379,92 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr ""
-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:583
msgid "Waiting for disc...\n"
msgstr ""
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:647
#, c-format
-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730
msgid "Copying package lists..."
msgstr ""
-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754
msgid "Writing new source list\n"
msgstr ""
-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr ""
-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:263
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -2527,10 +2519,6 @@ msgstr ""
msgid "Removed with config %s"
msgstr ""
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr ""
-
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 0ac3c04b8..e8a9c9672 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-01-04 18:51+0100\n"
"PO-Revision-Date: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -147,7 +147,7 @@ msgstr ""
#: 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 ""
@@ -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"
@@ -426,12 +438,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 ""
@@ -531,223 +543,223 @@ msgstr ""
msgid "Failed to rename %s to %s"
msgstr ""
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr ""
-#: 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 "ali je %s instaliran"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "ali se %s treba instalirati"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ali se ne može instalirati"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ali je virtuelni paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ali nije instaliran"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "ali se neće instalirati"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " ili"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
msgstr "Slijedeći paketi će biti UKLONJENI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
#, 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:444
msgid "The following packages will be upgraded:"
msgstr "Slijedeći paketi će biti nadograđeni:"
-#: 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 ""
-#: cmdline/apt-get.cc:544
+#: 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 ""
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr ""
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr ""
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr ""
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr ""
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr ""
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Ispravljam zavisnosti..."
-#: 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 "Ne mogu ispraviti zavisnosti"
-#: 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 " Urađeno"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
#, 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: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 ""
-#: 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 ""
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr ""
-#: 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 ""
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr ""
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, 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: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 "Da, uradi kako kažem!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -755,75 +767,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 "Odustani."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
#, 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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
-#: 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 "Odustajem od instalacije."
-#: 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 "[Instalirano]"
-#: 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"
@@ -831,79 +843,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 "Međutim, slijedeći paketi ga zamjenjuju:"
-#: 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"
@@ -911,158 +923,163 @@ 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 "Oštećeni paketi"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Predloženi paketi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Preporučeni paketi:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Računam nadogradnju..."
-#: 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 "Neuspješno"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Urađeno"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr ""
-#: 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 "Podržani moduli:"
-#: 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"
@@ -1263,7 +1280,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 +1333,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"
@@ -1614,7 +1632,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 ""
@@ -1745,76 +1763,76 @@ msgstr ""
msgid "Read error from %s process"
msgstr ""
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Čekam na zaglavlja"
-#: 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 "Nepoznat oblik datuma"
-#: 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 "Povezivanje neuspješno"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Unutrašnja greška"
@@ -1827,7 +1845,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 +1966,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 ""
@@ -2116,52 +2134,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 "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 ""
@@ -2205,7 +2223,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 ""
@@ -2225,12 +2243,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 ""
@@ -2348,31 +2366,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/ca.po b/po/ca.po
index 279615414..77e002c49 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\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: 2005-07-19 01:31+0200\n"
"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -150,7 +150,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 per a %s %s compilat el %s %s\n"
@@ -230,6 +230,22 @@ 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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive 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"
+
+#: 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 "Els arguments no són en parells"
@@ -513,12 +529,12 @@ msgstr "No es pot determinar l'estat de %s"
msgid "Archive had no package field"
msgstr "Arxiu sense el camp paquet"
-#: 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 " %s no té una entrada dominant\n"
-#: 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 " el mantenidor de %s és %s, no %s\n"
@@ -618,79 +634,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:120
msgid "Y"
msgstr "S"
-#: 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 "S'ha produït un error de compilació de l'expressió regular - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, c-format
msgid "but %s is installed"
msgstr "però està instal·lat %s"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "però s'instal·larà %s"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "però no és instal·lable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "però és un paquet virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "però no està instal·lat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "però no serà instal·lat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
msgstr "S'ELIMINARAN els següents paquets:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "S'actualitzaran els següents paquets:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Es DESACTUALITZARAN els següents paquets:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (per %s) "
-#: cmdline/apt-get.cc:544
+#: 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!"
@@ -698,146 +714,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:577
#, 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:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstal·lats, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualitzats, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "S'estan corregint les dependències..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " ha fallat."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "No es poden corregir les dependències"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Fet"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dependències sense satisfer. Proveu-ho usant -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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:693
msgid "Authentication warning overridden.\n"
msgstr "S'ha descartat l'avís d'autenticació.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "No s'ha pogut llegir la llista de les fonts."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Sí, fes el que et dic!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +864,28 @@ msgstr ""
"Per a continuar escriviu la frase «%s»\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Avortat."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,48 +893,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "No es poden corregir els paquets que falten."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "S'està avortant la instal·lació."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instal·lat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -929,50 +945,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:1110
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:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
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:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -980,25 +996,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, 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:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1022,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: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"
@@ -1018,7 +1034,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: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"
@@ -1028,119 +1044,125 @@ 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
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Paquets trencats"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Paquets suggerits:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Paquets recomanats:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ha fallat"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Fet"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
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:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr ""
+"S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Font descarregada %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "No s'ha pogut descarregar alguns arxius."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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: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 "L'ordre de construir «%s» ha fallat.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Ha fallat el procés fill"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1149,7 +1171,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1158,32 +1180,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
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:2383
msgid "Supported modules:"
msgstr "Mòduls suportats:"
-#: 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"
@@ -1441,7 +1463,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 +1516,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"
@@ -1800,7 +1823,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema escollint el fitxer"
@@ -1936,76 +1959,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:381
msgid "Waiting for headers"
msgstr "S'estan esperant les capçaleres"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Línia de capçalera incorrecta"
-#: 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 "El servidor http ha enviat una capçalera de resposta no vàlida"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Format de la data desconegut"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Ha fallat la selecció"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Connexió finalitzada"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Error escrivint en el fitxer d'eixida"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Error escrivint en el fitxer"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Error llegint des del servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Capçalera de dades no vàlida"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Ha fallat la connexió"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Error intern"
@@ -2018,7 +2041,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"
@@ -2139,7 +2162,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"
@@ -2306,52 +2329,52 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)"
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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, 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)"
@@ -2404,7 +2427,7 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2427,12 +2450,12 @@ msgstr ""
" '%s'\n"
"en la unitat de '%s' i premeu Intro\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "El sistema d'empaquetament '%s' no està suportat."
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
@@ -2556,11 +2579,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Suma MD5 diferent"
-#: 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 "
@@ -2570,7 +2593,7 @@ msgstr ""
"significar que haureu d'arreglar aquest paquet manualment (segons "
"arquitectura)."
-#: 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 "
@@ -2579,7 +2602,7 @@ msgstr ""
"No ha estat possible localitzar 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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2587,7 +2610,7 @@ 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:901
msgid "Size mismatch"
msgstr "Mida diferent"
diff --git a/po/cs.po b/po/cs.po
index 57084ffca..c366ba611 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-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-11 16:14+0100\n"
+"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-12-30 15:44+0100\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
@@ -147,7 +147,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 pro %s %s zkompilován na %s %s\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"
@@ -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"
@@ -431,7 +442,7 @@ msgstr "Datum souboru se změnil %s"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
-msgstr "Archív nemá kontrolní záznam"
+msgstr "Archiv nemá kontrolní záznam"
#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
@@ -506,14 +517,14 @@ msgstr "Nemohu vyhodnotit %s"
#: ftparchive/writer.cc:386
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:394 ftparchive/writer.cc:603
#, 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:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " správce %s je %s, ne %s\n"
@@ -613,80 +624,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: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 "Chyba při kompilaci regulárního výrazu - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, c-format
msgid "but %s is installed"
msgstr "ale %s je nainstalován"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s se bude instalovat"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ale nedá se nainstalovat"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ale je to virtuální balík"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ale není nainstalovaný"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "ale nebude se instalovat"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " nebo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
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:423
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:444
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:465
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:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvůli %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: 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!"
@@ -694,224 +704,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:577
#, 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:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalováno, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradováno, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Opravuji závislosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " selhalo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Nemohu opravit závislosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Nemohu minimalizovat sadu pro aktualizaci"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplněné závislosti. Zkuste použít -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Autentizační varování potlačeno.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "Nelze přečíst seznam zdrojů."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
+#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
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:868
+#, 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:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Přerušeno."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Nemohu opravit chybějící balíky."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Přerušuji instalaci."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr "[Instalovaný]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -922,49 +932,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:1110
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:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Nemohu uzamknout list adresář"
-#: 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."
@@ -972,33 +982,33 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Nemohu najít balík %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
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: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"
@@ -1009,7 +1019,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: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"
@@ -1019,124 +1029,128 @@ msgstr ""
"balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
"(bug report)."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Poškozené balíky"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Doporučované balíky:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Selhalo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
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:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Stáhnout zdroj %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
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:2056
#, 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:2068
#, 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:2069
#, 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:2086
#, 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:2105
msgid "Child process failed"
msgstr "Synovský proces selhal"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, 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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1145,31 +1159,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
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:2383
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: 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"
@@ -1222,23 +1236,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 +1272,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 +1286,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
@@ -1353,11 +1367,11 @@ msgstr "Selhalo spuštění gzipu "
#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
-msgstr "Porušený archív"
+msgstr "Porušený archiv"
#: apt-inst/contrib/extracttar.cc:195
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
#, c-format
@@ -1366,23 +1380,23 @@ 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 +1430,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"
@@ -1473,7 +1487,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"
@@ -1588,12 +1603,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,9 +1650,8 @@ 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"
@@ -1752,7 +1766,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 +1790,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashováním souboru"
@@ -1862,41 +1876,41 @@ msgstr "Nemohu se připojit k %s %s:"
#: methods/gpgv.cc:92
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
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
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Nemohu získat zámek %s"
+msgstr "Nemohu spustit "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " pro ověření podpisu (je gnupg nainstalováno?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznámá chyba při spouštění gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
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
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 +1922,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:381
msgid "Waiting for headers"
msgstr "Čekám na hlavičky"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: 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 "Http server poslal neplatnou hlavičku odpovědi"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má porouchanou podporu rozsahů"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Neznámý formát data"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Výběr selhal"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Čas spojení vypršel"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupního souboru"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Chyba zápisu do souboru"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Chyba čtení ze serveru"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Špatné datové záhlaví"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Spojení selhalo"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Vnitřní chyba"
@@ -1990,7 +2004,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 +2114,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 +2126,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"
@@ -2279,52 +2293,52 @@ msgstr "Nelze zpracovat soubor %s (1)"
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)"
@@ -2349,7 +2363,7 @@ msgstr "Indexový typ souboru '%s' není podporován"
#, 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
msgid ""
@@ -2373,10 +2387,10 @@ msgstr "Adresář seznamů %spartial chybí."
msgid "Archive directory %spartial is missing."
msgstr "Archivní adresář %spartial chybí."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Stahuji soubor %li z %li (%s zbývá)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2389,19 +2403,16 @@ 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
+#, 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:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nebylo možno určit vhodný typ balíčkovacího systému"
@@ -2522,11 +2533,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Neshoda MD5 součtů"
-#: 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 "
@@ -2535,7 +2546,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2544,14 +2555,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:814
#, 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:901
msgid "Size mismatch"
msgstr "Velikosti nesouhlasí"
@@ -2656,54 +2667,54 @@ 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 ""
+msgstr "Připravuji odstranění %s včetně konfiguračních souborů"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Odstraněn %s včetně konfiguračního souboru"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/da.po b/po/da.po
index a4800bf23..a674910d3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,14 +8,14 @@ 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-11-07 15:28+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.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:135
@@ -153,7 +153,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 for %s %s oversat p %s %s\n"
@@ -232,6 +232,18 @@ msgstr ""
" -o=? Angiv et opstningstilvalg. 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 "Indst 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 st."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Parametre ikke angivet i par"
@@ -514,12 +526,12 @@ msgstr "Kunne ikke finde %s"
msgid "Archive had no package field"
msgstr "Arkivet havde intet package-felt"
-#: 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 " %s har ingen tvangs-post\n"
-#: 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 " pakkeansvarlig for %s er %s, ikke %s\n"
@@ -619,79 +631,79 @@ msgstr "Problem under aflnkning af %s"
msgid "Failed to rename %s to %s"
msgstr "Kunne ikke omdbe %s til %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "J"
-#: 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 "Fejl ved tolkning af regulrt udtryk - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Flgende pakker har uopfyldte afhngigheder:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "men %s er installeret"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "men %s forventes installeret"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "men den kan ikke installeres"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "men det er en virtuel pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "men den er ikke installeret"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "men den bliver ikke installeret"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Flgende NYE pakker vil blive installeret:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Flgende pakker vil blive AFINSTALLERET:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Flgende pakker er blevet holdt tilbage:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Flgende pakker vil blive opgraderet:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Flgende pakker vil blive NEDGRADERET:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Flgende tilbageholdte pakker vil blive ndret:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (grundet %s) "
-#: cmdline/apt-get.cc:544
+#: 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!"
@@ -699,143 +711,143 @@ msgstr ""
"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n"
"Dette br IKKE ske medmindre du er helt klar over, hvad du laver!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu opgraderes, %lu nyinstalleres, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu geninstalleres, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderes, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Retter afhngigheder..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " mislykkedes."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Kunne ikke rette afhngigheder"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Kunne ikke minimere opgraderingssttet"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Uopfyldte afhngigheder. Prv med -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Flgende pakkers autensitet kunne ikke verificeres!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Autentifikationsadvarsel tilsidesat.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Installr disse pakker uden verifikation (y/N)? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
msgid "Internal error, Ordering didn't finish"
msgstr "Intern fejl. Sortering blev ikke fuldfrt"
-#: 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 "Kunne ikke lse nedhentningsmappen"
-#: 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 "Listen med kilder kunne ikke lses."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, 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:824
#, 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:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Ja, gr som jeg siger!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -846,28 +858,28 @@ msgstr ""
"For at fortstte, skal du skrive '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Afbryder."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Vil du fortstte [J/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 "Kunne ikke hente %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
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:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
-#: 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?"
@@ -875,49 +887,49 @@ msgstr ""
"Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' "
"eller prv med --fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og medieskift understttes endnu ikke"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Kunne ikke rette manglende pakker."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Afbryder installationen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Bemrk, at %s vlges fremfor %s\n"
-#: 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 ""
"Overspringer %s, da den allerede er installeret og opgradering er "
"deaktiveret.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Installeret]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Du br eksplicit vlge en at installere."
-#: 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"
@@ -928,49 +940,49 @@ msgstr ""
"anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n"
"kun kan hentes fra andre kilder\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Dog kan flgende pakker erstatte den:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installationskandidat"
-#: 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 "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kunne ikke lse listemappen"
-#: 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."
@@ -978,25 +990,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
-#: 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)."
@@ -1004,7 +1016,7 @@ msgstr ""
"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
"en lsning)."
-#: 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"
@@ -1015,7 +1027,7 @@ msgstr ""
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
"pakker endnu ikke er lavet eller gjort tilgngelige."
-#: 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"
@@ -1024,114 +1036,119 @@ msgstr ""
"Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt slet\n"
"ikke installeres og du br indsende en fejlrapport for denne pakke."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Flgende yderligere pakker vil blive installeret:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Foreslede pakker:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Anbefalede pakker:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Beregner opgraderingen... "
-#: 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 "Mislykkedes"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Intern fejl. Problemlseren delagde noget"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Henter kildetekst %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Nogle arkiver kunne ikke hentes."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Udpakningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Opbygningskommandoen '%s' fejlede.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Barneprocessen fejlede"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen opbygningsafhngigheder.\n"
-#: 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 "
@@ -1139,7 +1156,7 @@ msgid ""
msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
-#: 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 "
@@ -1148,32 +1165,32 @@ msgstr ""
"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
-#: 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 ""
"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
"ny"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Kunne ikke behandler opbygningsafhngighederne"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Understttede moduler:"
-#: 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"
@@ -1430,7 +1447,7 @@ msgstr "Dobbelt opstningsfil %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 +1500,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 lse %s"
@@ -1646,9 +1664,8 @@ 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"
@@ -1787,7 +1804,7 @@ msgstr "Tidsudlb 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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved \"hashing\" af fil"
@@ -1873,41 +1890,42 @@ msgstr "Kunne ikke forbinde til %s %s:"
#: methods/gpgv.cc:92
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
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!"
#: methods/gpgv.cc:196
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Stdte p mindst n ugyldig signatur."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Kunne ikke opn lsen %s"
+msgstr "Kunne ikke kre "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " for at verificere signaturen (er gnupg installeret?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Ukendt fejl ved krsel af gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Flgende yderligere pakker vil blive installeret:"
+msgstr "Flgende signaturer var ugyldige:\n"
#: methods/gpgv.cc:244
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
+"Flgende signaturer kunne ikke verificeret, da den offentlige ngle ikke er "
+"tilgngelig:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1919,77 +1937,77 @@ msgstr "Kunne ikke bne datarr for %s"
msgid "Read error from %s process"
msgstr "Lsefejl fra %s-process"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Afventer hoveder"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Ugyldig linje i hovedet"
-#: 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 "http-serveren sendte et ugyldigt svarhovede"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr ""
"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ukendt datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Valg mislykkedes"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsudlb p forbindelsen"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fejl ved skrivning af uddatafil"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Fejl ved skrivning til fil"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Fejl ved skrivning til filen"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Fejl ved lsning fra server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Ugyldige hoved-data"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Forbindelsen mislykkedes"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Intern fejl"
@@ -2002,7 +2020,7 @@ msgstr "Kan ikke udfre mmap for en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunne ikke udfre 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 +2141,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"
@@ -2290,52 +2308,52 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)"
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
-#, 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 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)"
@@ -2387,10 +2405,10 @@ msgstr "Listemappen %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Henter fil %li ud af %li (%s tilbage)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2403,19 +2421,16 @@ msgid "Method %s did not start correctly"
msgstr "Metoden %s startede ikke korrekt"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Medieskift: Indst disken med navnet\n"
-" '%s'\n"
-"i drevet '%s' og tryk retur\n"
+msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet '%s' understttes ikke"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunne ikke bestemme en passende pakkesystemtype"
@@ -2535,11 +2550,11 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
msgid "rename failed, %s (%s -> %s)."
msgstr "omdbning 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum stemmer ikke"
-#: 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 "
@@ -2548,7 +2563,7 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
-#: 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 "
@@ -2557,13 +2572,13 @@ msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
"ndt til manuelt at reparere denne pakke."
-#: 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 "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Strrelsen stemmer ikke"
@@ -2667,54 +2682,54 @@ 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 "Klargr %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 "Gr klar til at stte %s op"
#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
msgid "Configuring %s"
-msgstr "Forbinder til %s"
+msgstr "Stter %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 "Gr 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 ""
+msgstr "Gr klar til at fjerne %s inklusive opstning"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Fjernede %s inklusive opstning"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
@@ -2809,9 +2824,6 @@ msgstr "Forbindelsen lukkedes for hurtigt"
#~ msgid "Failed to rename %s.new to %s"
#~ msgstr "Kunne ikke omdbe %s.new til %s"
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr "Indst en disk i drevet og tryk retur"
-
#~ msgid "I found (binary):"
#~ msgstr "Jeg fandt (binre programfiler):"
@@ -2829,15 +2841,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 st."
-
#~ msgid ""
#~ "Usage: apt-cdrom [options] command\n"
#~ "\n"
diff --git a/po/de.po b/po/de.po
index 2327f8a44..f0e9530e0 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-01-04 18:51+0100\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"
@@ -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 für %s %s kompiliert am %s %s\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"
@@ -522,12 +537,12 @@ msgstr "Kann auf %s nicht zugreifen."
msgid "Archive had no package field"
msgstr "Archiv hatte kein Paket-Feld"
-#: 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 " %s hat keinen Eintrag in der Override-Liste.\n"
-#: 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-Maintainer ist %s und nicht %s\n"
@@ -627,79 +642,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:120
msgid "Y"
msgstr "J"
-#: 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 "Fehler beim Kompilieren eines regulären Ausdrucks - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, c-format
msgid "but %s is installed"
msgstr "aber %s ist installiert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "aber %s soll installiert werden"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ist aber nicht installierbar"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ist aber ein virtuelles Paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ist aber nicht installiert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "soll aber nicht installiert werden"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " oder "
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Die folgenden NEUEN Pakete werden installiert:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Die folgenden Pakete werden ENTFERNT:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "Die folgenden Pakete werden aktualisiert:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Die folgenden Pakete werden DEAKTUALISIERT:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegen %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -708,147 +723,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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualisiert, %lu neu installiert, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu erneut installiert, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu deaktualisiert, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Abhängigkeit werden korrigiert..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " fehlgeschlagen."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Kann Abhängigkeiten nicht korrigieren"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Fertig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
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: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 "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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "Die Liste der Quellen konnte nicht gelesen werden."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Ja, tu was ich sage!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -859,28 +874,28 @@ msgstr ""
"Zum Fortfahren geben Sie bitte »%s« ein.\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abbruch."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -888,48 +903,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Konnte fehlende Pakete nicht korrigieren."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Installation abgebrochen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Installiert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -940,51 +955,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:1110
msgid "However the following packages replace it:"
msgstr "Doch die folgenden Pakete ersetzen es:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paket %s hat keinen Installationskandidaten"
-#: 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 ""
"Re-Installation von %s ist nicht möglich,\n"
"es kann nicht heruntergeladen werden.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
-#: 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."
@@ -992,27 +1007,27 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Konnte Paket %s nicht finden"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1020,7 +1035,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: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"
@@ -1032,7 +1047,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: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"
@@ -1043,119 +1058,124 @@ msgstr ""
"dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
"dieses Paket erfolgen sollte."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Kaputte Pakete"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Vorgeschlagene Pakete:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Empfohlene Pakete:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Berechne Upgrade..."
-#: 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 "Fehlgeschlagen"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Fertig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
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:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Hole Quelle %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Konnte einige Archive nicht holen."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
-#: 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 "Build-Befehl »%s« fehlgeschlagen.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Kindprozess fehlgeschlagen"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1184,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1193,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Unterstützte Module:"
-#: 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"
@@ -1290,7 +1310,7 @@ msgstr "Hole:"
#: cmdline/acqprogress.cc:110
msgid "Ign "
-msgstr "Ign "
+msgstr "Ign "
#: cmdline/acqprogress.cc:114
msgid "Err "
@@ -1459,7 +1479,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 +1532,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"
@@ -1821,7 +1842,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
@@ -1954,78 +1975,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:381
msgid "Waiting for headers"
msgstr "Warte auf Kopfzeilen (header)"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Schlechte Kopfzeile"
-#: 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 "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Unbekanntes Datumsformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Auswahl fehlgeschlagen"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Verbindung erlitt Zeitüberschreitung"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fehler beim Schreiben einer Ausgabedatei"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Fehler beim Schreiben einer Datei"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Fehler beim Schreiben der Datei"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Fehler beim Lesen vom Server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Fehlerhafte Kopfzeilendaten"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Interner Fehler"
@@ -2038,7 +2059,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 +2181,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"
@@ -2327,52 +2348,52 @@ msgstr "Kann Paketdatei %s nicht parsen (1)"
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«)"
@@ -2424,7 +2445,7 @@ msgstr "Listenverzeichnis %spartial fehlt."
msgid "Archive directory %spartial is missing."
msgstr "Archivverzeichnis %spartial fehlt."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2447,12 +2468,12 @@ msgstr ""
" »%s«\n"
"in Laufwerk »%s« und drücken Sie die Eingabetaste.\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kann keinen passenden Paketierungssystem-Typ bestimmen"
@@ -2581,11 +2602,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5-Summe stimmt nicht"
-#: 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 "
@@ -2594,7 +2615,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2603,14 +2624,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:814
#, 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:901
msgid "Size mismatch"
msgstr "Größe stimmt nicht"
@@ -2861,10 +2882,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 +2899,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/el.po b/po/el.po
index 9988e9fc2..1d21a3cae 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,26 +11,27 @@
# 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"
"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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-12-22 23:06+0200\n"
+"Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\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
@@ -161,7 +162,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"
@@ -241,6 +242,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 "Τα ορίσματα δεν είναι σε ζεύγη"
@@ -528,12 +542,12 @@ msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
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 " %s δεν περιέχει εγγραφή παράκαμψης\n"
-#: 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"
@@ -633,80 +647,79 @@ msgstr "Πρόβλημα κατά την αποσύνδεση του %s"
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 "σφάλμα μεταγλωτισμου - %s"
-#: 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
-#, fuzzy
+#: 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!"
@@ -714,179 +727,180 @@ 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
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 ""
+msgstr "Παράκαμψη προειδοποίησης ταυτοποίησης.\n"
-#: 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 ""
+msgstr "Εσωτερικό σφάλμα, έγινε κλήση του Install Packages με σπασμένα πακέτα!"
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:775
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: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 ""
+"Πολύ περίεργο! Τα μεγέθη δεν ταιριάζουν, στείλτε μήνυμα στο apt@packages."
+"debian.org"
-#: 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
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %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
-#, fuzzy, c-format
+#: 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"
+"Πρόκειται να κάνετε κάτι πιθανόν πολύ επιζήμιο.\n"
"Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
" ?] "
-#: 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
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: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?"
@@ -894,49 +908,49 @@ msgstr ""
"Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
"ή το --fix-missing;"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr ""
"ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
-#: 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 "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
-#: 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 ""
"Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
-#: 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"
@@ -948,51 +962,51 @@ msgstr ""
"Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
"από άλλη πηγή\n"
-#: 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 "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
-#: 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 ""
"Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
"του\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το%s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "Η εντολή update δεν παίρνει ορίσματα"
-#: 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."
@@ -1000,25 +1014,25 @@ 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 "Αδύνατη η εύρεση του πακέτου %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1026,7 +1040,7 @@ msgstr ""
"Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
"πακέτο (ή καθορίστε μια λύση)."
-#: 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"
@@ -1038,7 +1052,7 @@ msgstr ""
"διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
"μετακινηθεί από τα εισερχόμενα."
-#: 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"
@@ -1048,118 +1062,124 @@ msgstr ""
"το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
"αναφορά σφάλματος για αυτό το πακέτο."
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
-msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
+msgstr ""
+"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
+"υλικό"
-#: 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 "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Μεταφόρτωση Κωδικα %s\n"
-#: 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 "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
-#: 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 "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
-#: 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 "
@@ -1167,7 +1187,7 @@ msgid ""
msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
-#: 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 "
@@ -1176,32 +1196,32 @@ msgstr ""
"%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
"εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
-#: 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 ""
"Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
"είναι νεώτερο"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
-#: 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"
@@ -1256,9 +1276,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"
@@ -1454,11 +1474,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 +1531,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"
@@ -1601,9 +1622,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 πακέτων πρέπει να αρχικοποιηθεί πρώτα"
+msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί"
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading file list"
@@ -1674,9 +1694,8 @@ 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"
@@ -1815,7 +1834,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 "Πρόβλημα κατά το hashing του αρχείου"
@@ -1901,41 +1920,43 @@ msgstr "Αδύνατη η σύνδεση στο %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
+"αποτυπώματος?!"
#: methods/gpgv.cc:196
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"
+msgstr "Αδύνατη η εκτέλεση "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " για την επαλήθευση της υπογραφής (είναι εγκατεστημένο το gnupg?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
+msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
#: methods/gpgv.cc:244
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 +1968,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
msgid "Read error from %s process"
msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
-#: 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 "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
-#: 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 "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
-#: 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 "Εσωτερικό Σφάλμα"
@@ -2030,7 +2051,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 +2174,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"
@@ -2323,52 +2344,52 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s
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 κατασκευαστή)"
@@ -2420,10 +2441,10 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται."
msgid "Archive directory %spartial is missing."
msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2436,19 +2457,18 @@ msgid "Method %s did not start correctly"
msgstr "Η μέθοδος %s δεν εκκινήθηκε σωστά"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Το σύστημα συσκευασίας '%s' δεν υποστηρίζεται"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Αδύνατος ο καθορισμός ενός κατάλληλου τύπου συστήματος πακέτων"
@@ -2490,39 +2510,39 @@ msgid "Cache has an incompatible versioning system"
msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκδοσης"
#: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (NewPackage)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
+msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2540,14 +2560,14 @@ msgstr ""
"Εκπληκτικό, υπερβήκατε τον αριθμό των εξαρτήσεων που υποστηρίζει το APT."
#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (FindPkg)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, c-format
@@ -2572,11 +2592,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Ανόμοιο MD5Sum"
-#: 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 "
@@ -2585,7 +2605,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
-#: 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 "
@@ -2594,7 +2614,7 @@ msgstr ""
"Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
"χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
-#: 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."
@@ -2602,7 +2622,7 @@ msgstr ""
"Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
"πακέτο %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Ανόμοιο μέγεθος"
@@ -2706,54 +2726,54 @@ 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 ""
+msgstr "Προετοιμασία για αφαίρεση με ρύθμιση του %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Αφαίρεσα με ρύθμιση το %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/en_GB.po b/po/en_GB.po
index 284bd61eb..c681c89f4 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-01-04 18:51+0100\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,140 +18,140 @@ 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-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 ""
+msgstr "%s %s for %s %s compiled on %s %s\n"
#: cmdline/apt-cache.cc:1658
msgid ""
@@ -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
#, 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,7 +415,7 @@ msgstr ""
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
-msgstr ""
+msgstr "No selections matched"
#: ftparchive/apt-ftparchive.cc:835
#, c-format
@@ -357,423 +425,425 @@ msgstr "Some files are missing in the package file group ‘%s’"
#: ftparchive/cachedb.cc:45
#, 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
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr ""
+msgstr "DB is old, attempting to upgrade %s"
#: ftparchive/cachedb.cc:73
-#, fuzzy, c-format
+#, 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
#, c-format
msgid "File date has changed %s"
-msgstr ""
+msgstr "File date has changed %s"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
-msgstr ""
+msgstr "Archive has no control record"
#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
-msgstr ""
+msgstr "Unable to get a cursor"
#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr ""
+msgstr "W: Unable to read directory %s\n"
#: ftparchive/writer.cc:83
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr ""
+msgstr "W: Unable to stat %s\n"
#: ftparchive/writer.cc:125
msgid "E: "
-msgstr ""
+msgstr "E:"
#: ftparchive/writer.cc:127
msgid "W: "
-msgstr ""
+msgstr "W:"
#: ftparchive/writer.cc:134
msgid "E: Errors apply to file "
-msgstr ""
+msgstr "E: Errors apply to file "
#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
-#, fuzzy, c-format
+#, c-format
msgid "Failed to resolve %s"
msgstr "Could not resolve ‘%s’"
#: ftparchive/writer.cc:163
msgid "Tree walking failed"
-msgstr ""
+msgstr "Tree walking failed"
#: ftparchive/writer.cc:188
#, c-format
msgid "Failed to open %s"
-msgstr ""
+msgstr "Failed to open %s"
#: ftparchive/writer.cc:245
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr ""
+msgstr " DeLink %s [%s]\n"
#: ftparchive/writer.cc:253
#, c-format
msgid "Failed to readlink %s"
-msgstr ""
+msgstr "Failed to readlink %s"
#: ftparchive/writer.cc:257
#, c-format
msgid "Failed to unlink %s"
-msgstr ""
+msgstr "Failed to unlink %s"
#: ftparchive/writer.cc:264
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr ""
+msgstr "*** Failed to link %s to %s"
#: ftparchive/writer.cc:274
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr ""
+msgstr " DeLink limit of %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 ""
+msgstr "Failed to stat %s"
#: ftparchive/writer.cc:386
msgid "Archive had no package field"
-msgstr ""
+msgstr "Archive had no package field"
-#: 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 ""
+msgstr " %s has no override entry\n"
-#: 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 ""
+msgstr " %s maintainer is %s not %s\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:120
msgid "Y"
-msgstr ""
+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 ""
+msgstr "Regex compilation error - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
-msgstr ""
+msgstr "The following packages have unmet dependencies."
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
-msgstr ""
+msgstr "but %s is installed"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
-msgstr ""
+msgstr "but it is not installable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
-msgstr ""
+msgstr "but it is a virtual package"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
-msgstr ""
+msgstr "but it is not installed"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:346
msgid " or"
-msgstr ""
+msgstr "or"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
-msgstr ""
+msgstr "The following packages will be REMOVED"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
-msgstr ""
+msgstr "The following packages will be upgraded:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+msgstr "The following packages will be DOWNGRADED:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
-msgstr ""
+msgstr "%s (due to %s) "
-#: cmdline/apt-get.cc:544
+#: 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 ""
+"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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
+msgstr "%lu upgraded, %lu newly installed, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
-msgstr ""
+msgstr "%lu reinstalled, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
-msgstr ""
+msgstr "%lu downgraded, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
-msgstr ""
+msgstr "Correcting dependencies..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
-msgstr ""
+msgstr " failed."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
-msgstr ""
+msgstr "Unable to correct dependencies"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
-msgstr ""
+msgstr "Unable to minimize the upgrade set"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
-msgstr ""
+msgstr "Done"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
-msgstr ""
+msgstr "Unmet dependencies. Try using -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Authentication warning overridden.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 ""
+msgstr "The list of sources could not be read."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
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:868
+#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
@@ -783,148 +853,155 @@ msgstr ""
"To continue type in the phrase ‘%s’\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
-msgstr ""
+msgstr "Abort"
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
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:990
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:995
msgid "Unable to correct missing packages."
-msgstr ""
+msgstr "Unable to correct missing packages."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
-msgstr ""
+msgstr "Aborting install."
-#: cmdline/apt-get.cc:1028
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1030
+#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
-msgstr ""
+msgstr " [Installed]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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: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 ""
+"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:1110
msgid "However the following packages replace it:"
-msgstr ""
+msgstr "However the following packages replace it:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
-msgstr ""
+msgstr "Unable to lock the list directory"
-#: 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 ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
+msgstr "Internal error, AllUpgrade broke stuff"
-#: 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 ""
+msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -932,166 +1009,183 @@ msgstr ""
"Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
"solution)."
-#: 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"
"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: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 ""
+"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
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
-msgstr ""
+msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
-msgstr ""
+msgstr "Broken packages"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
-msgstr ""
+msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
-msgstr ""
+msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
-msgstr ""
+msgstr "Calculating upgrade..."
-#: 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 ""
+msgstr "Failed"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
-msgstr ""
+msgstr "Done"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
+msgstr "Unable to find a source package for %s"
+
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skiping already downloaded file '%s'\n"
msgstr ""
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
-msgstr ""
+msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
-msgstr ""
+msgstr "Child process failed"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, 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:2273
#, 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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
-msgstr ""
+msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
-msgstr ""
+msgstr "Supported modules:"
-#: 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"
@@ -1132,35 +1226,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 +1304,7 @@ msgstr ""
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr ""
+msgstr "Unknown package record!"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1187,216 +1319,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
msgid "Failed to exec gzip "
-msgstr ""
+msgstr "Failed to exec gzip "
#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
-msgstr ""
+msgstr "Corrupted archive"
#: apt-inst/contrib/extracttar.cc:195
msgid "Tar checksum failed, archive corrupted"
-msgstr ""
+msgstr "Tar checksum failed, archive corrupted"
#: apt-inst/contrib/extracttar.cc:298
#, 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
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
msgid "Reading file listing"
-msgstr ""
+msgstr "Reading file listing"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1412,53 +1556,53 @@ 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 ""
+msgstr "The pkg cache must be initialized first"
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading file list"
-msgstr ""
+msgstr "Reading file list"
#: 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 +1610,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/gzip.cc:142
msgid "Failed to stat"
-msgstr ""
+msgstr "Failed to stat"
#: methods/copy.cc:79 methods/gpgv.cc:262 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 +1718,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
-msgstr ""
+msgstr "Problem hashing file"
#: methods/ftp.cc:877
#, c-format
@@ -1657,7 +1805,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,48 +1815,48 @@ msgstr "Data transfer failed, server said ‘%s’"
#. Get the files information
#: methods/ftp.cc:997
msgid "Query"
-msgstr ""
+msgstr "Query"
#: methods/ftp.cc:1106
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
#, 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
#, c-format
msgid "Connecting to %s"
-msgstr ""
+msgstr "Connecting to %s"
#: methods/connect.cc:165
#, c-format
@@ -1728,141 +1876,143 @@ msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
#: methods/connect.cc:221
#, c-format
msgid "Unable to connect to %s %s:"
-msgstr ""
+msgstr "Unable to connect to %s %s:"
#: methods/gpgv.cc:92
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
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
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’"
+msgstr "Could not execute "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " to verify signature (is gnupg installed?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Unknown error executing gpgv"
#: methods/gpgv.cc:237
msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "The following signatures were invalid:\n"
#: methods/gpgv.cc:244
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:381
msgid "Waiting for headers"
-msgstr ""
+msgstr "Waiting for headers"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
-msgstr ""
+msgstr "Bad header line"
-#: 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 ""
+msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "This HTTP server has broken range support"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
-msgstr ""
+msgstr "Unknown date format"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
-msgstr ""
+msgstr "Select failed"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
-msgstr ""
+msgstr "Connection timed out"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
-msgstr ""
+msgstr "Error writing to output file"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
-msgstr ""
+msgstr "Error writing to file"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
-msgstr ""
+msgstr "Error writing to the file"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
-msgstr ""
+msgstr "Error reading from server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
-msgstr ""
+msgstr "Bad header data"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
-msgstr ""
+msgstr "Connection failed"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
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 +2022,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 +2067,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 +2088,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 +2118,234 @@ 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
msgid "Building dependency tree"
-msgstr ""
+msgstr "Building dependency tree"
#: apt-pkg/depcache.cc:61
msgid "Candidate versions"
-msgstr ""
+msgstr "Candidate versions"
#: apt-pkg/depcache.cc:90
msgid "Dependency generation"
-msgstr ""
+msgstr "Dependency generation"
#: apt-pkg/tagfile.cc:73
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr ""
+msgstr "Unable to parse package file %s (1)"
#: apt-pkg/tagfile.cc:160
#, 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,6 +2354,9 @@ 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
@@ -2215,63 +2368,64 @@ msgstr "Index file type ‘%s’ is not supported"
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
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
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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Downloading file %li of %li (%s remaining)"
#: 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
+#, 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:120
#, 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:136
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 +2433,146 @@ 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
msgid "Cache has an incompatible versioning system"
-msgstr ""
+msgstr "Cache has an incompatible versioning system"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
+msgstr "Error occurred while processing %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
+msgstr "Error occurred while processing %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
+msgstr "Error occurred while processing %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
+msgstr "Error occurred while processing %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
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
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
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
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
+msgstr "Error occurred while processing %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
+msgstr "Error occurred while processing %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, 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
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr ""
+msgstr "Couldn't stat source package list %s"
#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
-msgstr ""
+msgstr "Collecting File Provides"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
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:911
msgid "MD5Sum mismatch"
-msgstr ""
+msgstr "MD5Sum mismatch"
-#: 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 ""
+"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: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 ""
+"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:814
#, 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:901
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 +2580,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 +2629,98 @@ 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 ""
+msgstr "Preparing for remove with config %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Removed with config %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr ""
+msgstr "Connection closed prematurely"
#~ 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 +2743,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..d670e2ee3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.24\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: 2005-02-08 20:36+0100\n"
"Last-Translator: Rubn Porras Campo <nahoo@inicia.es>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -151,7 +151,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 para %s %s compilado en %s %s\n"
@@ -232,6 +232,19 @@ msgstr ""
"cache=/tmp\n"
"Vea las pginas del manual apt-cache(8) y apt.conf(5) para ms informacin.\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"
@@ -522,12 +535,12 @@ msgstr "No pude leer %s"
msgid "Archive had no package field"
msgstr "Archivo no tiene campo de paquetes"
-#: 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 " %s no tiene entrada de predominio\n"
-#: 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 " el encargado de %s es %s y no %s\n"
@@ -627,79 +640,79 @@ 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:120
msgid "Y"
msgstr "S"
-#: 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 "Error de compilacin de expresiones regulares - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Los siguientes paquetes tienen dependencias incumplidas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "pero %s est instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
msgstr "pero no es instalable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "pero es un paquete virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "pero no est instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "pero no va a instalarse"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Se instalarn los siguientes paquetes NUEVOS:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Los siguientes paquetes se ELIMINARN:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Los siguientes paquetes se han retenido:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Se actualizarn los siguientes paquetes:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Se DESACTUALIZARN los siguientes paquetes:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Se cambiarn los siguientes paquetes retenidos:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -708,146 +721,146 @@ msgstr ""
"AVISO: Se van a eliminar los siguientes paquetes esenciales\n"
"Esto NO debe hacerse a menos que sepa exactamente lo que est haciendo!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu actualizados, %lu se instalarn, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Corrigiendo dependencias..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " fall."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "No se puede corregir las dependencias"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "No se puede minimizar el conjunto de actualizacin"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Listo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dependencias incumplidas. Pruebe de nuevo usando -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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: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 "Instalar estos paquetes sin verificacin [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "No se pudieron leer las listas de fuentes."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
"Que raro.. Los tamaos no concuerdan, mande un correo a \n"
"apt@packages.debian.org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, 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:824
#, 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:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Se utilizarn %sB de espacio de disco adicional despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Se liberarn %sB despus de desempaquetar.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Se especific Trivial Only pero sta no es una operacin trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "S, haga lo que le digo!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -858,28 +871,28 @@ msgstr ""
"Para continuar escriba la frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Imposible obtener %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
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:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Descarga completa y en modo de slo descarga"
-#: 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?"
@@ -887,47 +900,47 @@ msgstr ""
"No se pudieron obtener algunos archivos, quizs deba ejecutar\n"
"apt-get update o deba intentarlo de nuevo con --fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Actualmente no estn soportados --fix-missing e intercambio de medio"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "No se pudieron corregir los paquetes que faltan."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Abortando la instalacin."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Ignorando %s, ya esta instalado y la actualizacin no esta activada.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Necesita seleccionar explcitamente uno para instalar."
-#: 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"
@@ -938,49 +951,49 @@ msgstr ""
"a l. Esto puede significar que el paquete falta, est obsoleto o slo se\n"
"encuentra disponible desde alguna otra fuente\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "El paquete %s no tiene candidato para su instalacin"
-#: 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 "No es posible reinstalar el paquete %s, no se puede descargar.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ya est en su versin ms reciente.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "No se encontr la Distribucin '%s' para '%s'"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "No se encontr la versin '%s' para '%s'"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Versin seleccionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "El comando de actualizacin no toma argumentos"
-#: 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 "No se pudo bloquear el directorio de listas"
-#: 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."
@@ -988,25 +1001,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, 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:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, seleccionando %s para la expresin regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1027,7 @@ msgstr ""
"Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
"especifique una solucin)."
-#: 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"
@@ -1026,7 +1039,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: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"
@@ -1036,118 +1049,123 @@ msgstr ""
"paquete simplemente no sea instalable y debera de rellenar un informe de\n"
"error contra ese paquete."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "La siguiente informacin puede ayudar a resolver la situacin:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Se instalarn los siguientes paquetes extras:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Paquetes sugeridos:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Paquetes recomendados"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Calculando la actualizacin... "
-#: 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 "Fall"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Listo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Error interno, el sistema de solucin de problemas rompi\n"
"algunas cosas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente"
-#: 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 "No se pudo encontrar un paquete de fuentes para %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Fuente obtenida %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "No se pudieron obtener algunos archivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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: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 "Fall la orden de construccin '%s'.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Fall el proceso hijo"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Debe especificar al menos un paquete para verificar sus\n"
"dependencias de construccin"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "No se pudo obtener informacin de dependencias de construccin para %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tiene dependencias de construccin.\n"
-#: 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 "
@@ -1156,7 +1174,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1165,32 +1183,32 @@ msgstr ""
"La dependencia %s en %s no puede satisfacerse porque ninguna versin\n"
"disponible del paquete %s satisface los requisitos de versin"
-#: 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 ""
"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:2333
#, 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:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No se pudieron satisfacer las dependencias de construccin de %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "No se pudieron procesar las dependencias de construccin"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Mdulos soportados:"
-#: 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"
@@ -1451,7 +1469,7 @@ msgstr "Archivo de configuracin duplicado %s/%s"
msgid "Failed to write file %s"
msgstr "Fall el cierre 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 +1522,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"
@@ -1808,7 +1827,7 @@ msgstr "Expir conexin a socket de datos"
msgid "Unable to accept connection"
msgstr "No pude aceptar la conexin"
-#: 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 "Hay problemas enlazando fichero"
@@ -1940,76 +1959,76 @@ msgstr "No pude abrir una tubera para %s"
msgid "Read error from %s process"
msgstr "Error de lectura de %s procesos"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Esperando las cabeceras"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Obtuve una sola lnea de cabecera arriba de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Mala lnea de cabecera"
-#: 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 "El servidor de http envi una cabecera de respuesta invlida"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "El servidor de http envi una cabecera de Content-Length invlida"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "El servidor de http envi una cabecera de Content-Range invlida"
-#: methods/http.cc:570
+#: methods/http.cc:607
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:631
msgid "Unknown date format"
msgstr "Formato de fecha desconocido"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Fall la seleccin"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Expir la conexin"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Error escribiendo al archivo de salida"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Error escribiendo a archivo"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Error escribiendo al archivo"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Error leyendo del servidor, el lado remoto cerr la conexin."
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Error leyendo del servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Mala cabecera Data"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Fallo la conexin"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Error interno"
@@ -2022,7 +2041,7 @@ msgstr "No puedo hacer mmap de un fichero vaco"
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 "Seleccin %s no encontrada"
@@ -2147,7 +2166,7 @@ msgstr "Operacin invlida: %s"
msgid "Unable to stat the mount point %s"
msgstr "No se puede obtener informacin 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"
@@ -2314,52 +2333,52 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)"
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 "Lnea %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 "Lnea %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 "Lnea %lu mal formada en lista de fuentes %s (anlisis 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 "Lnea %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 "Lnea %lu mal formada en lista de fuentes %s (anlisis 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 "Lnea %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 "Lnea %u mal formada en lista de fuentes %s (tipo)"
-#: 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 "Tipo '%s' desconocido en la lnea %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 "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)"
@@ -2413,7 +2432,7 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2436,12 +2455,12 @@ msgstr ""
" '%s'\n"
"en la unidad '%s' y presione Intro\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "No se pudo determinar un tipo de sistema de paquetes adecuado"
@@ -2567,11 +2586,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "La suma MD5 difiere"
-#: 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 "
@@ -2581,7 +2600,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,7 +2609,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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2598,7 +2617,7 @@ msgstr ""
"Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' "
"no existe para para el paquete %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "El tamao difiere"
@@ -2965,9 +2984,6 @@ msgstr "La conexin 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 +3002,9 @@ msgstr "La conexin se cerr prematuramente"
#~ "No pude localizar ningn 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..42830a7a7 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,5 +1,3 @@
-# translation of eu.po to librezale.org
-# translation of apt_po_eu.po to librezale.org
# translation of apt-eu.po to Basque
# This file is put in the public domain.
# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
@@ -7,17 +5,17 @@
#
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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-11-07 22:37+0100\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: librezale.org <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"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"\n"
#: cmdline/apt-cache.cc:135
@@ -155,7 +153,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) konpilatua: %s %s\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"
@@ -514,12 +525,12 @@ msgstr "Huts egin du %s(e)tik datuak lortzean"
msgid "Archive had no package field"
msgstr "Artxiboak ez du pakete-eremurik"
-#: 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 " %s: ez du override sarrerarik\n"
-#: 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 mantentzailea %s da, eta ez %s\n"
@@ -619,79 +630,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: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 "Adierazpen erregularren konpilazio-errorea - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "baina %s instalatuta dago"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "baina %s instalatzeko dago"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "baina ez da instalagarria"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "baina pakete birtuala da"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "baina ez dago instalatuta"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "baina ez da instalatuko"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " edo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Ondorengo pakete BERRIAK instalatuko dira:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Ondorengo paketeak KENDUKO dira:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Ondorengo paketeak mantendu egin dira:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Ondorengo paketeak AURREKO BERTSIORA itzuliko dira:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Ondorengo pakete atxikiak aldatu egingo dira:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (arrazoia: %s) "
-#: cmdline/apt-get.cc:544
+#: 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!"
@@ -699,145 +710,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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu bertsio-berrituta, %lu berriki instalatuta, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu berrinstalatuta, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu aurreko bertsiora itzulita, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Mendekotasunak zuzentzen..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " : huts egin du."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Ezin dira mendekotasunak zuzendu"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Ezin da bertsio-berritzeko multzoa minimizatu"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Eginda"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Bete gabeko mendekotasunak. Probatu -f erabiliz."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "Egiaztapen abisua gainidazten.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "Ezin izan da iturburu-zerrenda irakurri."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Bai, egin esandakoa!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +859,28 @@ msgstr ""
"Jarratzeko, idatzi '%s' esaldia\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abortatu."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Deskarga amaituta eta deskarga soileko moduan"
-#: 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?"
@@ -877,47 +888,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Falta diren paketeak ezin dira zuzendu."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Abortatu instalazioa."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instalatuta]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Zehazki bat hautatu behar duzu instalatzeko."
-#: 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"
@@ -928,49 +939,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:1110
msgid "However the following packages replace it:"
msgstr "Baina ondorengo paketeek ordezten dute:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Ezin da zerrenda-direktorioa blokeatu"
-#: 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."
@@ -978,25 +989,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Ezin izan da %s paketea aurkitu"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1004,7 +1015,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: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"
@@ -1016,7 +1027,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: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"
@@ -1025,121 +1036,130 @@ 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
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Hautsitako paketeak"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Iradokitako paketeak:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Gomendatutako paketeak:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Berriketak kalkulatzen... "
-#: 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 "Huts egin du"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Eginda"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr ""
+"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Eskuratu %s iturubura\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Huts egin du zenbat artxibo lortzean."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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:2069
#, 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:2086
#, 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:2105
msgid "Child process failed"
msgstr "Prozesu umeak huts egin du"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, 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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1148,32 +1168,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Onartutako Moduluak:"
-#: 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"
@@ -1340,7 +1360,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"
@@ -1426,7 +1447,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 +1500,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"
@@ -1599,7 +1621,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 +1661,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."
@@ -1739,7 +1763,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 +1808,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Arazoa fitxategiaren hash egitean"
@@ -1833,7 +1858,8 @@ 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
#, c-format
@@ -1872,7 +1898,8 @@ 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?!"
+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
@@ -1914,76 +1941,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:381
msgid "Waiting for headers"
msgstr "Goiburuen zain"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Okerreko goiburu-lerroa"
-#: 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 "http zerbitzariak erantzun-buru baliogabe bat bidali du."
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr "http zerbitzariak barruti onarpena apurturik du"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Datu-formatu ezezaguna"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Hautapenak huts egin du"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Konexioaren denbora-muga gainditu da"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Errorea irteerako fitxategian idaztean"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Errorea fitxategian idaztean"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Errorea zerbitzaritik irakurtzean"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Goiburu data gaizki dago"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Konexioak huts egin du"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Barne-errorea"
@@ -1996,7 +2023,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 +2117,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 +2145,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 +2169,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
@@ -2286,52 +2315,52 @@ msgstr "Ezin da %s pakete-fitxategia analizatu (1)"
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)"
@@ -2355,8 +2384,10 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen"
#: 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 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
msgid ""
@@ -2380,7 +2411,7 @@ msgstr "%spartial zerrenda-direktorioa falta da."
msgid "Archive directory %spartial is missing."
msgstr "%spartial artxibo-direktorioa falta da."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)"
@@ -2400,12 +2431,12 @@ msgstr "%s metodoa ez da behar bezala abiarazi"
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:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Ezin da pakete-sistemaren mota egokirik zehaztu"
@@ -2523,11 +2554,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum ez dator bat"
-#: 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 "
@@ -2536,7 +2567,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2545,14 +2576,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:814
#, 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:901
msgid "Size mismatch"
msgstr "Tamaina ez dator bat"
@@ -2653,7 +2685,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
@@ -2708,4 +2741,3 @@ msgstr "%s konfigurazioaz kentzen"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Konexioa behar baino lehenago itxi da"
-
diff --git a/po/fi.po b/po/fi.po
index 3bccbd964..7ab6eec32 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-01-04 18:51+0100\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"
@@ -150,7 +150,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 laitealustalle %s %s käännöksen päiväys %s %s\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"
@@ -514,12 +530,12 @@ msgstr "Tiedostolle %s ei toimi stat"
msgid "Archive had no package field"
msgstr "Arkistossa ei ollut pakettikenttää"
-#: 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 " %s: ei poikkeustietuetta\n"
-#: 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 ylläpitäjä on %s eikä %s\n"
@@ -619,79 +635,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:120
msgid "Y"
msgstr "K"
-#: 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 "Käännösvirhe lausekkeessa - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, c-format
msgid "but %s is installed"
msgstr "mutta %s on asennettu"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "mutta %s on merkitty asennettavaksi"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "mutta ei ole asennuskelpoinen"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "mutta on näennäispaketti"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "mutta ei ole asennettu"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "mutta ei ole merkitty asennettavaksi"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " tai"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Seuraavat UUDET paketit asennetaan:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Seuraavat paketit POISTETAAN:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "Nämä paketit päivitetään:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Nämä paketit VARHENNETAAN:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Seuraavat pysytetyt paketit muutetaan:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (syynä %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -700,145 +716,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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu päivitetty, %lu uutta asennusta, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu uudelleen asennettua, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu varhennettua, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Korjataan riippuvuuksia..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " ei onnistunut."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Riippuvuuksien korjaus ei onnistu"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Päivitysjoukon minimointi ei onnistu"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Valmis"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
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: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 "Asennetaanko nämä paketit ilman todennusta [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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: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 "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, 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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "Lähteiden luetteloa ei pystynyt lukemaan."
-#: 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 "Noudettavaa arkistoa %st/%st.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Noudettavaa arkistoa %st.\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 "Purkamisen jälkeen käytetään %st lisää levytilaa.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Kyllä, tee kuten käsketään!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -849,28 +865,28 @@ msgstr ""
"Jatka kirjoittamalla \"%s\"\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Keskeytä."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -878,47 +894,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Puuttuvia paketteja ei voi korjata."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Asennus keskeytetään."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Asennettu]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Yksi pitää valita asennettavaksi."
-#: 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"
@@ -929,49 +945,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:1110
msgid "However the following packages replace it:"
msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Luettelokansiota ei voitu lukita"
-#: 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."
@@ -979,25 +995,25 @@ msgstr ""
"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
"käytetty vanhoja. "
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Pakettia %s ei löytynyt"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1005,7 +1021,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: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"
@@ -1016,7 +1032,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: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"
@@ -1026,116 +1042,121 @@ msgstr ""
"paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
"tuosta paketista."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Rikkinäiset paketit"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Ehdotetut paketit:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Suositellut paketit:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Ei onnistunut"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Valmis"
-#: 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 "Sisäinen virhe, AllUpgrade rikkoi jotain"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Nouda lähdekoodi %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Purkukomento \"%s\" ei onnistunut.\n"
-#: 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 "Paketointikomento \"%s\" ei onnistunut.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Lapsiprosessi kaatui"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1143,7 +1164,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1152,32 +1173,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Tuetut moduulit:"
-#: 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"
@@ -1431,7 +1452,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 +1505,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"
@@ -1787,7 +1809,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Pulmia tiedoston hajautuksessa"
@@ -1919,76 +1941,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:381
msgid "Waiting for headers"
msgstr "Odotetaan otsikoita"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Virheellinen otsikkorivi"
-#: 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 "HTTP-palvelin lähetti virheellisen vastausotsikon"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr "HTTP-palvelimen arvoaluetuki on rikki"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Tuntematon päiväysmuoto"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select ei toiminut"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Yhteys aikakatkaistiin"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Tapahtui virhe luettaessa palvelimelta"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Virheellinen otsikkotieto"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Yhteys ei toiminut"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Sisäinen virhe"
@@ -2001,7 +2023,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 +2144,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"
@@ -2289,52 +2311,52 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
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)"
@@ -2383,7 +2405,7 @@ msgstr "Luettelokansio %spartial puuttuu."
msgid "Archive directory %spartial is missing."
msgstr "Arkistokansio %spartial puuttuu."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2406,12 +2428,12 @@ msgstr ""
"\"%s\"\n"
"asemaan \"%s\" ja paina Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Sopivaa paketointijärjestelmän tyyppiä ei saa selvitettyä"
@@ -2531,11 +2553,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum ei täsmää"
-#: 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 "
@@ -2544,7 +2566,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2553,7 +2575,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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2561,7 +2583,7 @@ msgstr ""
"Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
"kenttää."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Koko ei täsmää"
diff --git a/po/fr.po b/po/fr.po
index 6fe746928..8159dcbca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,14 +2,14 @@
# Advanced Package Transfer - APT message translation catalog
# French messages
# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005.
+# 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2006-01-06 08:54+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -151,7 +151,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 pour %s %s est compil le %s %s\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 insrer un disque dans le lecteur et appuyez sur la touche Entre"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+"Veuillez rpter cette opration pour tous les disques de votre jeu de "
+"cdroms."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Les arguments ne sont pas en parit"
@@ -301,7 +317,8 @@ 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,7 +434,8 @@ msgstr "Aucune slection 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
#, c-format
@@ -518,12 +536,12 @@ msgstr "Impossible de statuer %s"
msgid "Archive had no package field"
msgstr "L'archive ne possde pas de champ de paquet"
-#: 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 "%s ne possde pas d'entre override\n"
-#: 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 " le responsable de %s est %s et non %s\n"
@@ -623,79 +641,79 @@ msgstr "Problme en dliant %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:120
msgid "Y"
msgstr "O"
-#: 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 "Erreur de compilation de l'expression rationnelle - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Les paquets suivants contiennent des dpendances non satisfaites:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "mais %s est install"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "mais %s devra tre install"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "mais il n'est pas installable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "mais c'est un paquet virtuel"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "mais il n'est pas install"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "mais ne sera pas install"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Les NOUVEAUX paquets suivants seront installs:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Les paquets suivants seront ENLEVS:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Les paquets suivants ont t conservs:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Les paquets suivants seront mis jour:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Les paquets suivants seront mis une VERSION INFRIEURE:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Les paquets retenus suivants seront changs:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (en raison de %s) "
-#: cmdline/apt-get.cc:544
+#: 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!"
@@ -704,137 +722,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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu mis jour, %lu nouvellement installs, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu rinstalls, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu remis une version infrieure, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu partiellement installs ou enlevs.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Correction des dpendances..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " a chou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Impossible de corriger les dpendances"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Fait"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dpendances manquantes. Essayez d'utiliser l'option -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ATTENTION: les paquets suivants n'ont pas t authentifis."
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "Avertissement d'authentification ignor.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Faut-il installer ces paquets sans vrification (o/N)? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Certains paquets n'ont pas pu tre authentifis"
-#: 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 "Il y a des problmes et -y a t employ sans --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr "Erreur interne, InstallPackages appel avec des paquets casss."
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
msgid "Packages need to be removed but remove is disabled."
-msgstr "Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
+msgstr ""
+"Les paquets doivent tre enlevs mais la dsinstallation est dsactive."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Impossible de verrouiller le rpertoire de tlchargement"
-#: 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 "La liste des sources ne peut tre lue."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Il est ncessaire de prendre %so/%so dans les archives.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Il est ncessaire de prendre %so dans les archives.\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 "Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
+msgstr ""
+"Aprs dpaquetage, %so d'espace disque supplmentaires seront utiliss.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Aprs dpaquetage, %so d'espace disque seront librs.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Impossible de dterminer l'espace disponible sur %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, 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:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
"L'option --trivial-only a t indique mais il ne s'agit pas d'une opration "
@@ -842,11 +862,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:866
msgid "Yes, do as I say!"
msgstr "Oui, faites ce que je vous dis!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -857,28 +877,28 @@ msgstr ""
"Pour continuer, tapez la phrase %s\n"
"?]"
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Annulation."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossible de rcuprer %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Certains fichiers n'ont pu tre tlchargs."
-#: 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 "Tlchargement achev et dans le mode tlchargement uniquement"
-#: 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?"
@@ -886,47 +906,48 @@ msgstr ""
"Impossible de rcuprer quelques archives, peut-tre devrez-vous lancer apt-"
"get update ou essayer avec --fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
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:995
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:996
msgid "Aborting install."
msgstr "Annulation de l'installation."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Note, slection de %s au lieu de %s\n"
-#: 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 "Passe %s, il est dj install et la mise jour n'est pas prvue.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Install]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Vous devez explicitement slectionner un paquet installer."
-#: 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"
@@ -938,49 +959,50 @@ msgstr ""
"devenu obsolte\n"
"ou qu'il n'est disponible que sur une autre source\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Cependant les paquets suivants le remplacent:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
+msgstr ""
+"La rinstallation de %s est impossible, il ne peut pas tre tlcharg.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s est dj la plus rcente version disponible.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, 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:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "La version %s de %s n'a pu tre trouve"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Impossible de verrouiller le rpertoire de liste"
-#: 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."
@@ -988,25 +1010,26 @@ msgstr ""
"Le tlchargement de quelques fichiers d'index a chou, ils ont t "
"ignors, ou les anciens ont t utiliss la place."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossible de trouver le paquet %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, slectionne %s pour l'expression rationnelle %s\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
+msgstr ""
+"Vous pouvez lancer apt-get -f install pour corriger ces problmes:"
-#: 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)."
@@ -1014,7 +1037,7 @@ msgstr ""
"Dpendances non satisfaites. Essayez apt-get -f install sans paquet\n"
"(ou indiquez une solution)."
-#: 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"
@@ -1026,7 +1049,7 @@ msgstr ""
"la distribution unstable, que certains paquets n'ont pas encore\n"
"t crs ou ne sont pas sortis d'Incoming."
-#: 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"
@@ -1035,118 +1058,123 @@ msgstr ""
"Puisque vous n'avez demand qu'une seule opration, le paquet n'est\n"
"probablement pas installable et vous devriez envoyer un rapport de bogue."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "L'information suivante devrait vous aider rsoudre la situation: "
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Paquets dfectueux"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Les paquets supplmentaires suivants seront installs: "
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Paquets suggrs:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Paquets recommands:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "chec"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Fait"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr ""
"Erreur interne, la tentative de rsolution du problme a cass certaines "
"parties"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Vous devez spcifier au moins un paquet source"
-#: 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 "Impossible de trouver une source de paquet pour %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Saut du tlchargement du fichier %s, dj tlcharg\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Ncessit de prendre %so/%so dans les sources.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Ncessit de prendre %so dans les sources.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Rcupration des sources %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "chec lors de la rcupration de quelques archives."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Saut du dcompactage des paquets sources dj dcompacts dans %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "La commande de dcompactage %s a chou.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Veuillez vrifier si le paquet dpkg-dev est install.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, 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:2105
msgid "Child process failed"
msgstr "chec du processus fils"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Il faut spcifier au moins un paquet pour vrifier les dpendances de "
"construction"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossible d'obtenir les dpendances de construction pour %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s n'a pas de dpendance de construction.\n"
-#: 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 "
@@ -1155,7 +1183,7 @@ msgstr ""
"La dpendance %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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1164,32 +1192,33 @@ msgstr ""
"La dpendance %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:2308
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Impossible de satisfaire la dpendance %s pour %s: le paquet install %s "
"est trop rcent"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Impossible de satisfaire les dpendances %s pour %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
+msgstr ""
+"Les dpendances de compilation pour %s ne peuvent pas tre satisfaites."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Impossible d'activer les dpendances de construction"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Modules reconnus:"
-#: 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"
@@ -1362,7 +1391,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 ""
"prcdant ce message sont importantes. Veuillez les corriger et\n"
"dmarrer l'[I]nstallation une nouvelle fois."
@@ -1448,7 +1478,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 clture du fichier %s"
@@ -1501,7 +1531,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"
@@ -1623,7 +1654,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 +1689,7 @@ msgstr ""
#: methods/cdrom.cc:131
msgid "Wrong CD-ROM"
-msgstr "Mauvais CD"
+msgstr "Mauvais cdrom"
#: methods/cdrom.cc:164
#, c-format
@@ -1726,7 +1758,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 rpondu: %s"
+msgstr ""
+"La commande %s du script de connexion a chou, le serveur a rpondu: %s"
#: methods/ftp.cc:291
#, c-format
@@ -1763,7 +1796,8 @@ msgstr "Impossible de crer un connecteur"
#: methods/ftp.cc:698
msgid "Could not connect data socket, connection timed out"
-msgstr "Impossible de se connecter sur le port de donnes, dlai de connexion dpass"
+msgstr ""
+"Impossible de se connecter sur le port de donnes, dlai de connexion dpass"
#: methods/ftp.cc:704
msgid "Could not connect passive socket."
@@ -1807,7 +1841,7 @@ msgstr "Dlai de connexion au port de donnes dpass"
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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problme de hachage du fichier"
@@ -1895,10 +1929,12 @@ msgstr "Impossible de se connecter %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr ""
+"E: liste de paramtres trop longue pour Acquire::gpgv::Options. Abandon."
#: methods/gpgv.cc:191
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
"Erreur interne: signature correcte, mais il est impossible de dterminer "
"l'empreinte de la cl."
@@ -1942,76 +1978,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:381
msgid "Waiting for headers"
msgstr "Attente des fichiers d'en-tte"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "J'ai une simple ligne d'en-tte au-dessus du caractre %u"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Mauvaise ligne d'en-tte"
-#: 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 "Le serveur http a envoy une rponse dont l'en-tte est invalide"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Le serveur http a envoy un en-tte Content-Length invalide"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Le serveur http a envoy un en-tte Content-Range invalide"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ce serveur http possde un support des limites non-valide"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Format de date inconnu"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Slection dfaillante"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Dlai de connexion dpass"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Erreur d'criture du fichier de sortie"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Erreur d'criture sur un fichier"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Erreur d'criture sur le fichier"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Erreur de lecture depuis le serveur distant et clture de la connexion"
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Erreur de lecture du serveur"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Mauvais en-tte de donne"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "chec de la connexion"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Erreur interne"
@@ -2024,7 +2060,7 @@ msgstr "Impossible de mapper un fichier vide en mmoire"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossible de raliser un mapping de %lu octets en mmoire"
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
#, c-format
msgid "Selection %s not found"
msgstr "La slection %s n'a pu tre trouve"
@@ -2147,7 +2183,7 @@ msgstr "L'opration %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'accder %s"
@@ -2314,55 +2350,59 @@ msgstr "Impossible de traiter le fichier %s (1)"
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 forme 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 forme 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 forme 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 forme dans la liste des sources %s (distribution absolue)"
+msgstr ""
+"Ligne %lu mal forme 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 forme dans la liste des sources %s (analyse de distribution)"
+msgstr ""
+"Ligne %lu mal forme 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 forme 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 forme dans la liste des sources %s (identifiant du fournisseur)"
+msgstr ""
+"Ligne %u mal forme dans la liste des sources %s (identifiant du fournisseur)"
#: apt-pkg/packagemanager.cc:402
#, c-format
@@ -2383,7 +2423,8 @@ msgstr "Le type de fichier d'index %s n'est pas accept"
#: apt-pkg/algorithms.cc:241
#, 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 rinstall, mais je ne parviens pas trouver son "
"archive."
@@ -2412,7 +2453,7 @@ msgstr "Le rpertoire %spartial pour les listes n'existe pas."
msgid "Archive directory %spartial is missing."
msgstr "Le rpertoire d'archive %spartial n'existe pas."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Tlchargement du fichier %li de %li (%s restant)"
@@ -2434,12 +2475,12 @@ msgstr ""
"Veuillez insrer le disque %s dans le lecteur %s et appuyez sur la "
"touche Entre."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Le systme de paquet %s n'est pas support"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossible de dterminer un type du systme de paquets adquat"
@@ -2450,7 +2491,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 insrer quelques adresses sources dans votre sources.list"
+msgstr ""
+"Vous devez insrer 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."
@@ -2524,7 +2566,8 @@ msgstr ""
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vous avez dpass le nombre de versions que cet APT est capable de traiter."
+msgstr ""
+"Vous avez dpass le nombre de versions que cet APT est capable de traiter."
#: apt-pkg/pkgcachegen.cc:213
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2560,18 +2603,19 @@ msgstr "Assemblage des fichiers lists dans les champs Provides"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
-msgstr "Erreur d'entre/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr ""
+"Erreur d'entre/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:911
msgid "MD5Sum mismatch"
msgstr "Somme de contrle MD5 incohrente"
-#: 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 "
@@ -2581,7 +2625,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,14 +2634,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:814
#, 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:901
msgid "Size mismatch"
msgstr "Taille incohrente"
@@ -2755,4 +2800,3 @@ msgstr "%s purg"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connexion ferme prmaturment"
-
diff --git a/po/gl.po b/po/gl.po
index 41dc38c38..55b9f7d4b 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-11-09 01:49+0100\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 versin %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 "Versins 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 "Relacins versin/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 Provisins: "
+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 versin 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 patrn"
+msgstr "Debe fornecer exactamente un patrón"
#: cmdline/apt-cache.cc:1385
msgid "No packages found"
-msgstr "Non se atopou ningn 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 "(ningn)"
+msgstr "(ningún)"
#. Candidate Version
#: cmdline/apt-cache.cc:1522
@@ -134,12 +135,12 @@ 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 " Tboa de versin:"
+msgstr " Táboa de versións:"
#: cmdline/apt-cache.cc:1556
#, c-format
@@ -148,7 +149,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 para %s %s compilado en %s %s\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 [opcins] comando\n"
-" apt-cache [opcins] add ficheiro1 [ficheiro2 ...]\n"
-" apt-cache [opcins] 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 informacin 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 cachs, a de paquetes e a de fontes\n"
-" showpkg - Mostra algunha informacin xeral para un s paquete\n"
-" showsrc - Mostra a informacin de fonte\n"
-" stats - Mostra algunhas estatsticas bsicas\n"
-" dump - Mostra o ficheiro enteiro nun formato terso\n"
-" dumpavail - Imprime un ficheiro dispoible sada estndar\n"
-" unmet - Mostra dependencias incumplidas\n"
-" search - Busca na lista de paquetes por un patrn de expresin regular\n"
-" show - Mostra un rexistro lexible para o paquete\n"
-" depends - Mostra a informacin de dependencias en bruto para o paquete\n"
-" rdepends - Mostra a informacin de dependencias inversas do paquete\n"
-" pkgnames - Lista os nomes de todos os paquetes\n"
-" dotty - Xera grficas do paquete para GraphVis\n"
-" xvcg - Xera grficas do paquete para xvcg\n"
-" policy - Mostra parmetros 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"
-"Opcins:\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 configuracin\n"
-" -o=? Establece unha opcin de configuracin arbitraria, ex -o dir::\n"
-"cache=/tmp\n"
-"Vexa as pxinas do manual apt-cache(8) y apt.conf(5) para mis informacin.\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 [opcins] comando\n"
+"Emprego: apt-config [opcións] orde\n"
"\n"
-"apt-config unha ferramenta para ler o ficheiro de configuracin 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 configuracin\n"
+"Ordes:\n"
+" shell - Modo de intérprete de ordes\n"
+" dump - Amosa a configuración\n"
"\n"
-"Opcins:\n"
+"Opcións:\n"
" -h Este texto de axuda.\n"
-" -c=? Lee este ficheiro de configuracin\n"
-" -o=? Establece unha opcin de configuracin 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 vlido."
+msgstr "%s non é un paquete DEB válido."
#: cmdline/apt-extracttemplates.cc:232
msgid ""
@@ -278,17 +293,17 @@ 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 informacin de\n"
-"configuracin 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"
-"Opcins:\n"
-" -h Este texto de axuda.\n"
-" -t Define o directorio temporal\n"
-" -c=? Lee este ficheiro de configuracin\n"
-" -o=? Establece unha opcin de configuracin 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
#, c-format
@@ -297,31 +312,31 @@ 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 versin 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 extensin 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 extensin 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,39 +379,83 @@ 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 seleccin 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 algns ficheiros no grupo de ficheiro de paquetes `%s'"
+msgstr "Fallan ficheiros no grupo de ficheiros de paquetes \"%s\""
#: ftparchive/cachedb.cc:45
#, 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
#, 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:73
#, 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
#, c-format
msgid "File date has changed %s"
-msgstr "Cambiou a data do ficheiro %s"
+msgstr "A data do ficheiro cambiou %s"
#: ftparchive/cachedb.cc:155
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
msgid "Unable to get a cursor"
@@ -410,7 +469,7 @@ msgstr "A: Non se puido ler o directorio %s\n"
#: ftparchive/writer.cc:83
#, 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
msgid "E: "
@@ -422,7 +481,7 @@ msgstr "A: "
#: ftparchive/writer.cc:134
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
#, c-format
@@ -431,7 +490,7 @@ msgstr "Non se puido resolver %s"
#: ftparchive/writer.cc:163
msgid "Tree walking failed"
-msgstr "Fallou o recorrido pola rbore."
+msgstr "O percorrido da árbore fallou"
#: ftparchive/writer.cc:188
#, c-format
@@ -441,56 +500,56 @@ msgstr "Non se puido abrir %s"
#: ftparchive/writer.cc:245
#, c-format
msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr " DesLig %s [%s]\n"
#: ftparchive/writer.cc:253
#, c-format
msgid "Failed to readlink %s"
-msgstr "Non se puido ler a ligazn %s"
+msgstr "Non se puido ler a ligazón %s"
#: ftparchive/writer.cc:257
#, c-format
msgid "Failed to unlink %s"
-msgstr "Non se puido desligar %s"
+msgstr "Non se puido borrar %s"
#: ftparchive/writer.cc:264
#, 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
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink chegou ao lmite 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"
+msgstr "Non se atopou %s"
#: ftparchive/writer.cc:386
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:394 ftparchive/writer.cc:603
#, 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:437 ftparchive/writer.cc:689
#, 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/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 +559,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 la %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 la %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 la %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 descoecido de compresin '%s'"
+msgstr "Algoritmo de compresión \"%s\" descoñecido"
#: ftparchive/multicompress.cc:105
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Sada comprimida %s necesita una ferramenta de compresin"
+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 creacin dunha tubera 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 compresin"
+msgstr "Fillo de compresión"
#: ftparchive/multicompress.cc:238
#, c-format
@@ -550,7 +609,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 +617,591 @@ 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:120
msgid "Y"
msgstr "S"
-#: 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 "Erro de compilacin de expresins regulares - %s"
+msgstr "Erro na compilación da expresión regular - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
-msgstr "Os seguintes paquetes teen dependencias incumplidas:"
+msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, 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:329
#, 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:336
msgid "but it is not installable"
-msgstr "pero non instalable"
+msgstr "pero non é instalable"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
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:341
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:341
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:346
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
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:423
msgid "The following packages have been kept back:"
-msgstr "Os seguintes paquetes retivronse:"
+msgstr "Os seguintes paquetes consérvanse:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
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:465
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:485
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:538
#, 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: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 ""
+"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:577
#, 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:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desactualizados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
-msgstr "Correxindo dependencias..."
+msgstr "A corrixir as dependencias..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " fallou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
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:658
msgid "Unable to minimize the upgrade set"
-msgstr "Non se puido minimizar o conxunto de actualizacin"
+msgstr "Non se puido minimizar o xogo de actualizacións"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
-msgstr " Listo"
+msgstr " Rematado"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
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:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Ignórase o aviso de autenticación.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
-msgstr "Instalar estos paquetes sen verificacin [s/N]? "
+msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
-msgstr "Algns 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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "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:816
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:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Necestase descargar %sB/%sB de arquivos.\n"
+msgstr "Hai que recibir %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
+#, 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:849
#, 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:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Especificouse Trivial Only pero sta non unha operacin trivial."
+msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
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:868
#, 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:874 cmdline/apt-get.cc:893
msgid "Abort."
-msgstr "Abortado."
+msgstr "Abortar."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
msgid "Some files failed to download"
-msgstr "Algns 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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Non se puideron obter algns 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:990
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Actualmente non estn 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:995
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:996
msgid "Aborting install."
-msgstr "Abortando a instalacin."
+msgstr "A abortar a instalación."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Ignorando %s, xa est instalado e a actualizacin 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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: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 ""
-"O paquete %s non est dispoible, pero algn outro paquete fai referencia\n"
-"a el. Isto pode significar que o paquete falta, est obsoleto ou s se\n"
-"atopa dispoible 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:1110
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:1113
#, c-format
msgid "Package %s has no installation candidate"
-msgstr "O paquete %s non ten candidato para sa instalacin"
+msgstr "O paquete %s non ten un candidato para a instalación"
-#: 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 "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:1141
#, c-format
msgid "%s is already the newest version.\n"
-msgstr "%s xa est na sa versin mis recente.\n"
+msgstr "%s xa é a versión máis recente.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Non se atopou a Distribucin '%s' para '%s'"
+msgstr "Non se atopou a versión \"%s\" de \"%s\""
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "Non se atopou a versin '%s' para '%s'"
+msgstr "Non se atopou a versión \"%s\" de \"%s\""
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
-msgstr "Versin 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:1313
msgid "The update command takes no arguments"
-msgstr "O comando de actualizacin non toma argumentos"
+msgstr "A orde \"update\" non toma argumentos"
-#: 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 "Non se puido bloquear o directorio de listas"
-#: 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 ""
-"Algns 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:1403
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:1502 cmdline/apt-get.cc:1538
#, 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:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Nota, seleccionando %s para a expresin regular '%s'\n"
+msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
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:1558
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 solucin)."
+"Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
+"especifique unha solución)."
-#: 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"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Non se puideron instalar algns paquetes. Isto pode significar que\n"
-"vostede pediu unha situacin imposible ou, se est usando a distribucin\n"
-"inestable, que algns 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: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 ""
-"Como s solicitou unha nica operacin, extremadamente posible que o\n"
-"paquete simplemente non sexa instalable e debera 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
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
-msgstr "A seguinte informacin pode axudar a resolver a situacin:"
+msgstr "A seguinte información pode axudar a resolver a situación:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Paquetes rotos"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
-msgstr "Paquetes suxeridos:"
+msgstr "Paquetes suxiridos:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
-msgstr "Paquetes recomendados"
+msgstr "Paquetes recomendados:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
-msgstr "Calculando a actualizacin... "
+msgstr "A calcular a actualización... "
-#: 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 "Fallou"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
-msgstr "Listo"
+msgstr "Rematado"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
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:1885
msgid "Must specify at least one package to fetch source for"
-msgstr "Debe especificar ao menos un paquete para obter seu cdigo 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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, 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:2028
msgid "Failed to fetch some archives."
-msgstr "Non se puideron obter algns arquivos."
+msgstr "Non se puido recibir algúns arquivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Fallou o comando de construccin '%s'.\n"
+msgstr "Fallou a codificación de %s.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
-msgstr "Fallou o proceso fillo"
+msgstr "O proceso fillo fallou"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
-"Debe especificar ao menos un paquete para verificar sas\n"
-"dependencias de construccin"
+"Ten que especificar alomenos un paquete para lle comprobar as dependencias "
+"de compilación"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Non se puido obter informacin de dependencias de construccin 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:2169
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s non ten dependencias de construccin.\n"
+msgstr "%s non ten dependencias de compilación.\n"
-#: 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 ""
-"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:2273
#, 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 versin\n"
-"dispoible do paquete %s satisfai os requisitos de versin"
+"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:2308
#, 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:2333
#, 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:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "No se puideron satisfacer as dependencias de construccin de %s."
+msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
-msgstr "Non se puideron procesar as dependencias de construccin"
+msgstr "Non se puido procesar as dependencias de compilación"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
-msgstr "Mdulos soportados:"
+msgstr "Módulos soportados:"
-#: 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"
@@ -1174,53 +1242,54 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Uso: apt-get [opcins] comando\n"
-" apt-get [opcins] install|remove paq1 [paq2 ...]\n"
-" apt-get [opcins] 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 la de comandos para descargar e\n"
-"instalar paquetes. Os comandos mis 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 actualizacin\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 construccin para paquetes "
-"fonte\n"
-" dist-upgrade - Actualiza a distribucin, vexa apt-get(8)\n"
-" dselect-upgrade - Segue as seleccins 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"
-"Opcins:\n"
+"Opcións:\n"
" -h Este texto de axuda.\n"
-" -q Sada rexistrable - sen indicador de progreso\n"
-" -qq Sen sada, excepto se hai erros\n"
-" -d S descarga - NON instala ou desempaqueta os arquivos\n"
-" -s Non acta. Realiza unha simulacin\n"
-" -y Asume S para todas as consultas\n"
-" -f Intenta continuar se a comprobacin de integridade faia\n"
-" -m Intenta continuar se os arquivos non son localizables\n"
-" -u Mostra tamn unha lista de paquetes actualizados\n"
-" -b Constre o paquete fonte despois de obtelo\n"
-" -V Mosta nmeros de versin detallados\n"
-" -c=? Lee este ficheiro de configuracin\n"
-" -o=? Establece unha opcin de configuracin arbitraria, p. ex. \n"
-" -o dir::cache=/tmp\n"
-"Consulte as pxinas do manual de apt-get(8), sources.list(5) e apt.conf(5)\n"
-"para mis informacin e opcins.\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 +1302,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 +1316,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 descoecido!"
+msgstr "¡Rexistro de paquete descoñecido!"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1268,21 +1337,21 @@ msgid ""
" -c=? Read this configuration file\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-"Uso: apt-sortpkgs [opcins] ficheiro1 [ficheiro2 ...]\n"
+"Emprego: apt-sortpkgs [opcións] fich1 [fich2 ...]\n"
"\n"
-"apt-sortpkgs unha ferramenta sinxela para ordenar ficheiros de paquetes.\n"
-"A opcin -s utilzase 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"
-"Opcins:\n"
-" -h Este texto de axuda.\n"
-" -s Emprega ordenamiento de ficheiros fuente\n"
-" -c=? Lee este ficheiro de configuracin\n"
-" -o=? Establece unha opcin de configuracin 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 "Parmetro por omisin 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 +1360,207 @@ msgstr "Prema Intro para continuar."
#: dselect/install:100
msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Ocorreron algns 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 corrxaas 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 informacin dispoible"
+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
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
msgid "Corrupted archive"
-msgstr ""
+msgstr "Arquivo corrompido"
#: apt-inst/contrib/extracttar.cc:195
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
#, 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 extensin 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 extensin 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 creacin dunha tubera 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
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
msgid "Reading file listing"
-msgstr ""
+msgstr "A ler a lista de ficheiros"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1510,819 +1569,806 @@ 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 ""
+msgstr "Ten que se inicializar a caché de paquetes primeiro"
#: apt-inst/deb/dpkgdb.cc:386
msgid "Reading file list"
-msgstr ""
+msgstr "A ler a lista de paquetes"
#: 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/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
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 actualizacin"
+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 actualizacin"
+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:963 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
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
#, 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
#, c-format
msgid "Connecting to %s"
-msgstr ""
+msgstr "A conectar a %s"
#: methods/connect.cc:165
-#, fuzzy, c-format
+#, c-format
msgid "Could not resolve '%s'"
-msgstr "Non se puido resolver %s"
+msgstr "Non se puido resolver \"%s\""
#: methods/connect.cc:171
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr ""
+msgstr "Fallo temporal ao resolver \"%s\""
#: methods/connect.cc:174
#, 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
+#, 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:92
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
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
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Atopouse alomenos unha sinatura non válida."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Non se puido atopar o paquete %s"
+msgstr "Non se puido executar "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " para verificar a sinatura (¿está gnupg instalado?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro descoñecido ao executar gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
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
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:381
msgid "Waiting for headers"
-msgstr ""
+msgstr "A agardar polas cabeceiras"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
-msgstr ""
+msgstr "Liña de cabeceira incorrecta"
-#: 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 ""
+msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
-msgstr "Rexistro de paquete descoecido!"
+msgstr "Formato de data descoñecido"
-#: methods/http.cc:741
-#, fuzzy
+#: methods/http.cc:778
msgid "Select failed"
-msgstr " fallou."
+msgstr "Fallou a chamada a select"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
-msgstr ""
+msgstr "A conexión esgotou o tempo"
-#: methods/http.cc:769
-#, fuzzy
+#: methods/http.cc:806
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:837
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:865
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:879
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:881
msgid "Error reading from server"
-msgstr ""
+msgstr "Erro ao ler do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
-msgstr ""
+msgstr "Datos da cabeceira incorrectos"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
-msgstr ""
+msgstr "A conexión fallou"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
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 extensin 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
msgid "Building dependency tree"
-msgstr ""
+msgstr "A construír a árbore de dependencias"
#: apt-pkg/depcache.cc:61
-#, fuzzy
msgid "Candidate versions"
-msgstr " Candidato: "
+msgstr "Versións candidatas"
#: apt-pkg/depcache.cc:90
msgid "Dependency generation"
-msgstr ""
+msgstr "Xeración de dependencias"
#: apt-pkg/tagfile.cc:73
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "Non se puido localizar o paquete %s"
+msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
#: apt-pkg/tagfile.cc:160
-#, fuzzy, c-format
+#, 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 +2377,229 @@ 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
#, 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
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
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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "A descargar o ficheiro %li de %li (fallan %s)"
#: 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
+#, 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:120
#, 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:136
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
msgid "Cache has an incompatible versioning system"
-msgstr ""
+msgstr "A caché ten un sistema de versionamento incompatible"
#: apt-pkg/pkgcachegen.cc:117
#, c-format
msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
#, c-format
msgid "Error occurred while processing %s (UsePackage1)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
#, c-format
msgid "Error occurred while processing %s (UsePackage2)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
#, c-format
msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
#, c-format
msgid "Error occurred while processing %s (NewVersion1)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
#, c-format
msgid "Error occurred while processing %s (UsePackage3)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
#, c-format
msgid "Error occurred while processing %s (NewVersion2)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
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
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
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
#, c-format
msgid "Error occurred while processing %s (FindPkg)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
#, c-format
msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr ""
+msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
#, 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
+#, 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
msgid "Collecting File Provides"
-msgstr ""
+msgstr "A recoller as provisións de ficheiros"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
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:911
msgid "MD5Sum mismatch"
-msgstr ""
+msgstr "Os MD5Sum non coinciden"
-#: 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 ""
+"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: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 ""
+"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:814
#, 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:901
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 +2607,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 +2657,97 @@ 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 ""
+msgstr "A se preparar para a eliminación con config %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Eliminouse con config %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
-msgstr ""
+msgstr "A conexión pechouse prematuramente"
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..cfe59f829 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: hu\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: 2005-02-15 18:03+0100\n"
"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
"Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -151,7 +151,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 ehhez: %s %s fordítás ideje: %s %s\n"
@@ -230,6 +230,22 @@ 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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive 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"
+
+#: 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 "Az argumentumok nincsenek párban"
@@ -515,12 +531,12 @@ msgstr "%s elérése sikertelen"
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:394 ftparchive/writer.cc:603
#, 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:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s karbantartója %s, nem %s\n"
@@ -620,79 +636,79 @@ msgstr "Probléma %s unlinkelésekor"
msgid "Failed to rename %s to %s"
msgstr "Nem sikerült átnevezni a következőt: %s erre: %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "I"
-#: 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 "Regex fordítási hiba - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "A következő csomagoknak teljesítetlen függőségei vannak:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "de %s van telepítve"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "de csak %s telepíthető"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "de az nem telepíthető"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "de az egy virtuális csomag"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "de az nincs telepítve"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:346
msgid " or"
msgstr " vagy"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "A következő ÚJ csomagok lesznek telepítve:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "A következő csomagok el lesznek TÁVOLÍTVA:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "A következő csomagok vissza lesznek tartva:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "A következő csomagok frissítve lesznek:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "A következő csomagok VISSZA lesznek fejlesztve:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "A következő visszatartott csomagok fel lesznek váltva:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (%s miatt) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -701,144 +717,144 @@ 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!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu újra lesz telepítve, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu vissza lesz fejlesztve, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu csomag nincs teljesen telepítve vagy eltávolítva.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Függőségek javítása..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " sikertelen."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Nem lehet javítani a függőségeket"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Kész"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "FIGYELMEZTETÉS: A következő csomagok nem hitelesíthetőek!"
-#: 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 "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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: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 "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Belső hiba egy eltérítés hozzáadásakor"
-#: 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 "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: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 "A források listája olvashatatlan."
-#: 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 "Az archívumokból %sB/%sB-t kell letölteni.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%sB-t kell letölteni az archívumokból.\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 "Kicsomagolás után %sB lemezterület lesz felhasználva.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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"
-#: 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 "Nincs elég szabad hely itt: %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Nincs elég szabad hely itt: %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 "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Igen, tedd amit mondok!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -849,28 +865,28 @@ msgstr ""
"A folytatáshoz írd be a következő kifejezést '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Megszakítva."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nem sikerült letölteni a következőt: %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -878,47 +894,47 @@ 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."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing és a média csere még nem támogatott"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Nem lehet javítani a hiányzó csomagokat."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Telepítés megszakítása."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, 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"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr " [Telepítve]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Egyet határozottan ki kell választanod telepítésre."
-#: 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"
@@ -929,49 +945,49 @@ msgstr ""
"hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n"
"vagy csak más forrásból érhető el\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Azonban a következő csomagok felváltják:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez"
-#: 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 "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
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:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -979,26 +995,26 @@ 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."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Nem található a(z) %s csomag"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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 :"
-#: 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)."
@@ -1006,7 +1022,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: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"
@@ -1018,7 +1034,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: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"
@@ -1028,118 +1044,123 @@ msgstr ""
"hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
"kitölteni a csomaghoz."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Törött csomagok"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "A következő extra csomagok kerülnek telepítésre:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Javasolt csomagok:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Ajánlott csomagok:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Sikertelen"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Kész"
-#: 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 "Belső hiba, AllUpgrade megsértett valamit"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "%sB/%sB forrásarchívot kell letölteni.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB forrásarchívumot kell letölteni.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Forrás letöltése: %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
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:2056
#, 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:2068
#, 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: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 "'%s' elkészítési parancs nem sikerült.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Hiba a gyermekfolyamatnál"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1148,7 +1169,7 @@ 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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1157,32 +1178,32 @@ 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."
-#: 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 ""
"%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:2333
#, 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:2347
#, 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:2351
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:2383
msgid "Supported modules:"
msgstr "Támogatott modulok:"
-#: 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"
@@ -1434,7 +1455,7 @@ msgstr "Dupla %s/%s konfigurációs fájl"
msgid "Failed to write file %s"
msgstr "Nem sikerült a(z) %s fájlba írni"
-#: 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,7 +1508,8 @@ 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ó"
@@ -1794,7 +1816,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probléma a fájl hash értékének meghatározásakor"
@@ -1926,76 +1948,76 @@ msgstr "Nem lehet csövet nyitni ehhez: %s"
msgid "Read error from %s process"
msgstr "Olvasási hiba a(z) %s folyamattól"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Várakozás a fejlécekre"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Rossz fejléc sor"
-#: 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 "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Ismeretlen dátum formátum"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Sikertelen kiválasztás"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Időtúllépés a kapcsolatban"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Hiba a kimeneti fájl írásakor"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Hiba fájl írásakor"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Hiba a fájl írásakor"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Hiba a kiszolgálóról olvasáskor"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Rossz fejlécadat"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Kapcsolódás sikertelen"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Belső hiba"
@@ -2009,7 +2031,7 @@ 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ó"
@@ -2131,7 +2153,7 @@ msgstr "%s érvénytelen művelet"
msgid "Unable to stat the mount point %s"
msgstr "%s csatlakoztatá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"
@@ -2298,52 +2320,52 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, 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"
-#: 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)"
@@ -2394,7 +2416,7 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2417,12 +2439,12 @@ msgstr ""
" %s\n"
"címkéjű lemezt a(z) %s meghajtóba és üss entert\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "A megfelelő csomagrendszer típusa nem határozható meg"
@@ -2547,11 +2569,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Az MD5Sum nem megfelelő"
-#: 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 "
@@ -2560,7 +2582,7 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot. (hiányzó arch. miatt)"
-#: 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 "
@@ -2569,14 +2591,14 @@ msgstr ""
"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
"kell kijavítani a csomagot."
-#: 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 ""
"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:901
msgid "Size mismatch"
msgstr "A méret nem megfelelő"
diff --git a/po/it.po b/po/it.po
index aee5acc04..e7aa6ec0a 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2006-01-01 18:02+0100\n"
"Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
@@ -147,7 +147,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 per %s %s compilato il %s %s\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"
@@ -513,12 +525,12 @@ msgstr "Impossibile analizzare %s"
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:394 ftparchive/writer.cc:603
#, 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:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s mantainer %s non %s\n"
@@ -618,79 +630,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:120
msgid "Y"
msgstr "S"
-#: 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 "Errore di compilazione della regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "ma %s installato"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
msgstr "ma non installabile"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ma un pacchetto virtuale"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ma non installato"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:346
msgid " or"
msgstr " oppure"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
msgstr "I seguenti pacchetti saranno RIMOSSI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "I seguenti pacchetti saranno aggiornati:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "I seguenti pacchetti saranno RETROCESSI (DOWNGRADED):"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "I seguenti pacchetti bloccati saranno cambiati:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (a causa di %s) "
-#: cmdline/apt-get.cc:544
+#: 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!"
@@ -699,149 +711,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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aggiornati, %lu installati, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstallati, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu retrocessi (downgraded), "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Correzione delle dipendenze in corso..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " fallita."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Impossibile correggere le dipendenze"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Impossibile minimizzare l'insieme da aggiornare"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Fatto"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dipendenze non trovate. Riprovare usando -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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:693
msgid "Authentication warning overridden.\n"
msgstr "Avviso di autenticazione disabilitato \n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "La lista dei sorgenti non pu essere letta."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "SI, esegui come richiesto!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -852,28 +864,28 @@ msgstr ""
"Per continuare scrivere la frase '%s' \n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Interrotto."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Impossibile ottenere %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -881,49 +893,49 @@ 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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Impossibile correggere i pacchetti mancanti"
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Interruzione dell'installazione in corso."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Installato]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Bisogna esplicitamente sceglierne uno da installare."
-#: 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"
@@ -935,49 +947,49 @@ msgstr ""
" Questo significa che il pacchetto manca, diventato obsoletoo "
"disponibile solo all'interno di un'altra sorgente\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Comunque il seguente pacchetto lo sostituisce:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
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:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -985,26 +997,26 @@ msgstr ""
"Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
"si useranno quelli precedenti."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossibile trovare %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1012,7 +1024,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: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"
@@ -1024,7 +1036,7 @@ 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: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"
@@ -1034,116 +1046,121 @@ msgstr ""
"il pacchetto semplicemente non sia installabile, si consiglia\n"
"di inviare un \"bug report\" per tale pacchetto."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Pacchetto non integro"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "I seguenti pacchetti verranno inoltre installati:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Pacchetti suggeriti:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Pacchetti raccomandati:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Fallito"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Fatto"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Errore interno, problem resolver ha rotto qualcosa"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente"
-#: 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 "Impossibile trovare un pacchetto sorgente per %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Si saltata l'estrazione del sorgente gi estratto in %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Prelievo del sorgente %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Non stato possibile scaricare alcuni archivi."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando di estrazione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Comando di costruzione '%s' fallito.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Processo figlio fallito"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1169,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,32 +1178,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Il calcolo delle dipendenze per la costruzione fallito"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Moduli supportati:"
-#: 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"
@@ -1448,7 +1465,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 +1519,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"
@@ -1805,7 +1823,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemi nella creazione dell'hash del file"
@@ -1941,77 +1959,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:381
msgid "Waiting for headers"
msgstr "In attesa degli header"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Linea nell'header non corretta"
-#: 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 "Il server HTTP ha inviato un header di risposta non valido"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Formato della data sconosciuto"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select fallito"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tempo limite per la connessione esaurito"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Errore nella scrittura del file di output"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Errore nella scrittura nel file"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Errore nella lettura dal server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Header dei dati malformato"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Connessione fallita"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Errore interno"
@@ -2024,7 +2042,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 +2167,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"
@@ -2317,52 +2335,52 @@ msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
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"
@@ -2413,7 +2431,7 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Scaricamento del file %li di %li (%s rimanente)"
@@ -2435,12 +2453,12 @@ msgstr ""
"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
"invio."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
@@ -2566,11 +2584,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Somma MD5 non corrispondente"
-#: 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 "
@@ -2580,7 +2598,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2589,7 +2607,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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2597,7 +2615,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:901
msgid "Size mismatch"
msgstr "Le Dimensioni non corrispondono"
@@ -2783,7 +2801,7 @@ msgstr "Connessione chiusa prematuramente"
#~ msgstr "-> '"
#~ msgid "Followed conf file from "
-#~ msgstr "Si Ú seguito il file di configurazione da "
+#~ msgstr "Si Ú seguito il file di configurazione da "
#~ msgid " to "
#~ msgstr " a "
@@ -2845,9 +2863,6 @@ msgstr "Connessione chiusa prematuramente"
#~ 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):"
@@ -2862,17 +2877,12 @@ msgstr "Connessione chiusa prematuramente"
#~ 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'"
+#~ msgstr ""
+#~ "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian"
#~ 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"
@@ -2897,22 +2907,23 @@ msgstr "Connessione chiusa prematuramente"
#~ msgstr ""
#~ "Utilizzo: apt-cdrom [opzioni] comando\n"
#~ "\n"
-#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\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"
+#~ " 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"
+#~ " -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"
@@ -2976,7 +2987,7 @@ msgstr "Connessione chiusa prematuramente"
#~ " -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"
+#~ " -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"
@@ -3003,7 +3014,7 @@ msgstr "Connessione chiusa prematuramente"
#~ msgstr " non "
#~ msgid "DSC file '%s' is too large!"
-#~ msgstr "il file DSC '%s' Ú troppo largo!"
+#~ 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'"
diff --git a/po/ja.po b/po/ja.po
index 4fa47b0e6..445e575c1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.6\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: 2005-02-09 12:54+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -149,7 +149,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 for %s %s ѥ: %s %s\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 "ڥǤϤޤ"
@@ -513,12 +529,12 @@ msgstr "%s stat ˼Ԥޤ"
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 " %s override ȥ꤬ޤ\n"
-#: 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 " %1$s ƥʤ %3$s ǤϤʤ %2$s Ǥ\n"
@@ -618,79 +634,79 @@ msgstr "%s unlink ꤬ȯޤ"
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 "ɽŸ顼 - %s"
-#: 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"
@@ -699,146 +715,146 @@ 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
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 "ڤʤˤΥѥå򥤥󥹥ȡ뤷ޤ [y/N]? "
-#: 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
#, 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: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 "%2$sB %1$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 "Trivial Only ꤵޤϴñǤϤޤ"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -849,28 +865,28 @@ msgstr ""
"³Ԥˤϡ'%s' Ȥե졼򥿥פƤ\n"
" ?] "
-#: 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
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?"
@@ -878,49 +894,49 @@ msgstr ""
"ĤΥ֤Ǥޤapt-get update ¹Ԥ뤫 --fix-"
"missing ץդƻƤߤƤ"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing ȥǥ򴹤ϸƱˤϥݡȤƤޤ"
-#: 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 "ա%2$s %1$s 򤷤ޤ\n"
-#: 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 ""
"˥󥹥ȡ뤵Ƥꥢåץ졼ɤꤵƤʤᡢ%s 򥹥å"
"ޤ\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "ѥå %s ϥ󥹥ȡ뤵ƤʤᡢϤǤޤ\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s ϰʲΥѥå󶡤Ƥ벾ۥѥåǤ:\n"
-#: 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"
@@ -931,49 +947,49 @@ msgstr ""
"餯ΥѥåĤʤ⤦ŤʤäƤ뤫\n"
"뤤̤ΥΤߤѤǤʤȤͤޤ\n"
-#: 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 "ѥå %s ˤϥ󥹥ȡ䤬ޤ"
-#: 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 "ɤǤʤᡢ%s κƥ󥹥ȡԲǽǤ\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s ϴ˺ǿСǤ\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "'%2$s' Υ꡼ '%1$s' ĤޤǤ"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "'%2$s' ΥС '%1$s' ĤޤǤ"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, 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:1313
msgid "The update command takes no arguments"
msgstr "update ޥɤϰޤ"
-#: 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 "list ǥ쥯ȥå뤳ȤǤޤ"
-#: 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."
@@ -981,27 +997,27 @@ msgstr ""
"ĤΥǥåեΥɤ˼Ԥޤ̵뤵줿"
"뤤ϸŤΤѤޤ"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "顼AllUpgrade ˲ޤ"
-#: 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 "ѥå %s դޤ"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1009,7 +1025,7 @@ msgstr ""
"̤ΰ¸طǤ'apt-get -f install' ¹ԤƤߤƤ(ޤϲˡ"
"Ƥ)"
-#: 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"
@@ -1021,7 +1037,7 @@ msgstr ""
"Incoming ưƤʤ԰ǥǥȥӥ塼Ѥ\n"
"ƤΤȹͤޤ"
-#: 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"
@@ -1031,117 +1047,122 @@ msgstr ""
"ǽ⤤ǤΤᡢΥѥåؤΥХݡȤäƤ\n"
""
-#: 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 "顼AllUpgrade ˲ޤ"
-#: 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 "%s ΥѥåĤޤ"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s ˽ʬʶڡޤ"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "%sB Υ֤ɬפޤ\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr " %s \n"
-#: 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 "Ǥ %s Ÿ줿뤿ᡢŸ򥹥åפޤ\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ÿޥ '%s' Ԥޤ\n"
-#: 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 "ӥɥޥ '%s' Ԥޤ\n"
-#: 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 ""
"builddeps åѥå򾯤ʤȤ 1 Ļꤹɬפޤ"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "%s build-dependency 뤳ȤǤޤ"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s ˤ build depends ꤵƤޤ\n"
-#: 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 "
@@ -1150,7 +1171,7 @@ msgstr ""
"ѥå %3$s Ĥʤᡢ%2$s Ф %1$s ΰ¸ط"
"Ǥޤ"
-#: 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 "
@@ -1159,32 +1180,32 @@ msgstr ""
"ǽ %3$s ϤСˤĤƤ׵ʤᡢ%2$s "
" %1$s ΰ¸طȤǤޤ"
-#: 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 ""
"%2$s ΰ¸ط %1$s ȤǤޤ: 󥹥ȡ뤵줿 %3$s ѥ"
"Ͽޤ"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, 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:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s Build-dependency ȤǤޤǤ"
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "build dependency ν˼Ԥޤ"
-#: 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"
@@ -1439,7 +1460,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 Υ˼Ԥޤ"
@@ -1493,7 +1514,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 ɤ߹ळȤǤޤ"
@@ -1797,7 +1819,7 @@ msgstr "ǡå³ॢ"
msgid "Unable to accept connection"
msgstr "³ accept Ǥޤ"
-#: 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 "եΥϥåǤ"
@@ -1929,76 +1951,76 @@ msgstr "%s Фƥѥפ򳫤ޤǤ"
msgid "Read error from %s process"
msgstr "%s ץɤ߹ߥ顼"
-#: 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 "%u ʸۤ 1 ԤΥإåޤ"
-#: 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 "http Фʥץ饤إåƤޤ"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http Ф Content-Length إåƤޤ"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http Ф Content-Range إåƤޤ"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "http ФΥ󥸥ݡȤƤޤ"
-#: 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 "select ˼Ԥޤ"
-#: 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 "顼"
@@ -2011,7 +2033,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 Ĥޤ"
@@ -2132,7 +2154,7 @@ msgstr " %s"
msgid "Unable to stat the mount point %s"
msgstr "ޥȥݥ %s stat Ǥޤ"
-#: 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 ѹ뤳ȤǤޤ"
@@ -2299,52 +2321,52 @@ msgstr "ѥåե %s ᤹뤳ȤǤޤ (1)"
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 ܤǤ (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)"
-#: 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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, 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)"
@@ -2395,7 +2417,7 @@ msgstr "ꥹȥǥ쥯ȥ %spartial Ĥޤ"
msgid "Archive directory %spartial is missing."
msgstr "֥ǥ쥯ȥ %spartial Ĥޤ"
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2418,12 +2440,12 @@ msgstr ""
" '%s'\n"
"ȥ٥դǥɥ饤 '%s' enter 򲡤Ƥ\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "ѥå󥰥ƥ '%s' ϥݡȤƤޤ"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "ŬڤʥѥåƥॿפǤޤ"
@@ -2547,11 +2569,11 @@ msgstr "å¸ IO 顼ȯޤ"
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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum Ŭ礷ޤ"
-#: 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 "
@@ -2560,7 +2582,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ (¸ߤʤƥΤ)"
-#: 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 "
@@ -2569,7 +2591,7 @@ msgstr ""
"ѥå %s Υեΰ֤Ǥޤ󡣤餯Υѥåư"
"ǽɬפޤ"
-#: 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."
@@ -2577,7 +2599,7 @@ msgstr ""
"ѥåǥåե뤬Ƥޤѥå %s Filename: "
"եɤޤ"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Ŭ礷ޤ"
diff --git a/po/ko.po b/po/ko.po
index fa14ee87d..fa9ce0107 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,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-01-04 18:51+0100\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"
@@ -145,7 +145,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"
@@ -224,6 +224,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 ""
+"미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n"
+"디스크를 넣고 enter를 누르십시오\n"
+" '%1$s'\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 "인수가 두 개가 아닙니다"
@@ -510,12 +526,12 @@ msgstr "%s의 정보를 읽는 데 실패했습니다"
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 " %s에는 override 항목이 없습니다\n"
-#: 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"
@@ -615,79 +631,79 @@ msgstr "%s의 링크를 해제하는 데 문제가 있습니다"
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 "정규식 컴파일 오류 - %s"
-#: 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 "하지만 %s 꾸러미를 설치하지 않을 것입니다"
-#: 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"
@@ -696,148 +712,148 @@ 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
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 "확인하지 않고 꾸러미를 설치하시겠습니까 [y/N]? "
-#: 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
#, 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: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 "%s바이트/%s바이트 아카이브를 받아야 합니다.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "%s바이트 아카이브를 받아야 합니다.\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 "압축을 풀면 %s바이트의 디스크 공간을 더 사용하게 됩니다.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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
+#: 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 ""
"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
"아닙니다."
# 입력을 받아야 한다. 한글 입력을 못 할 수 있으므로 원문 그대로 사용.
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +864,28 @@ msgstr ""
"계속하시려면 다음 문구를 입력하십시오: '%s'\n"
" ?] "
-#: 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
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?"
@@ -877,48 +893,48 @@ msgstr ""
"아카이브를 받을 수 없습니다. 아마도 apt-get update를 실행해야 하거나 --fix-"
"missing 옵션을 줘서 실행해야 할 것입니다."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing 옵션과 동시에 미디어 바꾸기는 현재 지원하지 않습니다"
-#: 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 "주의, %2$s 대신에 %1$s 꾸러미를 선택합니다\n"
-#: 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 ""
"%s 꾸러미를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "%s 꾸러미를 설치하지 않았으므로, 지우지 않습니다\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "%s 꾸러미는 다음 꾸러미가 제공하는 가상 꾸러미입니다:\n"
-#: 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"
@@ -929,49 +945,49 @@ msgstr ""
"해당 꾸러미가 누락되었거나 지워졌다는 뜻입니다. 아니면 또 다른 곳에서\n"
"꾸러미를 받아와야 하는 경우일 수도 있습니다.\n"
-#: 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 "%s 꾸러미는 설치할 수 있는 후보가 없습니다"
-#: 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 "%s 꾸러미를 다시 설치하는 건 불가능합니다. 내려 받을 수 없습니다.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 꾸러미는 이미 최신 버전입니다.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "%2$s 꾸러미의 '%1$s' 릴리즈를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "%2$s 꾸러미의 '%1$s' 버전을 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, 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:1313
msgid "The update command takes no arguments"
msgstr "update 명령은 인수를 받지 않습니다"
-#: 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."
@@ -979,26 +995,26 @@ msgstr ""
"일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버"
"전을 대신 사용합니다."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: 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 "%s 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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
+#: cmdline/apt-get.cc:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1022,7 @@ msgstr ""
"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
"(아니면 해결 방법을 지정하십시오)."
-#: 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"
@@ -1017,7 +1033,7 @@ msgstr ""
"불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
"아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
-#: 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"
@@ -1026,115 +1042,120 @@ msgstr ""
"한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
"없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
-#: 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 "내부 오류, AllUpgrade때문에 망가졌습니다"
-#: 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 "%s의 소스 꾸러미를 찾을 수 없습니다"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "%s에 충분한 공간이 없습니다"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "%s 소스를 가져옵니다\n"
-#: 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 "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "압축 풀기 명령 '%s' 실패.\n"
-#: 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 "빌드 명령 '%s' 실패.\n"
-#: 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 "%s의 빌드 의존성 정보를 가져올 수 없습니다"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
-#: 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 "
@@ -1143,7 +1164,7 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
"다"
-#: 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 "
@@ -1152,32 +1173,32 @@ msgstr ""
"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
-#: 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 ""
"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 꾸러미가 너"
"무 최근 버전입니다"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, 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:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
-#: 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"
@@ -1430,7 +1451,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 파일을 닫는 데 실패했습니다"
@@ -1483,7 +1504,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을(를) 읽을 수 없습니다"
@@ -1785,7 +1807,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 "파일 해싱에 문제가 있습니다"
@@ -1917,76 +1939,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
msgid "Read error from %s process"
msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
-#: 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 "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
-#: 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 "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
-#: 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 "select가 실패했습니다"
-#: 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 "내부 오류"
@@ -1999,7 +2021,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 +2142,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 디렉토리로 이동할 수 없습니다"
@@ -2287,52 +2309,52 @@ msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)"
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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, 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번 줄이 잘못되었습니다 (벤더 ID)"
@@ -2382,7 +2404,7 @@ msgstr "목록 디렉토리 %spartial이 빠졌습니다."
msgid "Archive directory %spartial is missing."
msgstr "아카이브 디렉토리 %spartial이 빠졌습니다."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2405,12 +2427,12 @@ msgstr ""
"디스크를 넣고 enter를 누르십시오\n"
" '%1$s'\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "꾸러미 시스템 '%s'을(를) 지원하지 않습니다"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "올바른 꾸러미 시스템 타입을 알아낼 수 없습니다"
@@ -2528,11 +2550,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum이 맞지 않습니다"
-#: 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 "
@@ -2541,7 +2563,7 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다. (아키텍쳐가 빠졌기 때문입니다)"
-#: 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 "
@@ -2550,14 +2572,14 @@ msgstr ""
"%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
"니다."
-#: 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 ""
"꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "크기가 맞지 않습니다"
diff --git a/po/makefile b/po/makefile
index bb8118c77..45e5b1e5a 100644
--- a/po/makefile
+++ b/po/makefile
@@ -66,7 +66,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 +74,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..168ee23d6 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-01-04 18:51+0100\n"
"PO-Revision-Date: 2005-02-09 10:45+0100\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
"Language-Team: Norwegian Bokml <i18n-nb@lister.ping.ui.no>\n"
@@ -162,7 +162,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 for %s %s kompilert p %s %s\n"
@@ -242,6 +242,22 @@ msgstr ""
" -o=? Sett en vilkrlig 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"
@@ -528,12 +544,12 @@ msgstr "Klarte ikke f statusen p %s"
msgid "Archive had no package field"
msgstr "Arkivet har ikke noe pakkefelt"
-#: 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 " %s har ingen overstyringsoppfring\n"
-#: 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-vedlikeholderen er %s, ikke %s\n"
@@ -633,79 +649,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:120
msgid "Y"
msgstr "J"
-#: 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 "Kompileringsfeil i regulrt uttrykk - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Flgende pakker har uinnfridde avhengighetsforhold:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installeres"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "men lar seg ikke installere"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "men er en virtuell pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "men er ikke installert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "men skal ikke installeres"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Flgende NYE pakker vil bli installert:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Flgende pakker vil bli FJERNET:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Flgende pakker er holdt tilbake:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Flgende pakker vil bli oppgradert:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Flgende pakker vil bli NEDGRADERT:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Flgende pakker vil bli endret:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (pga. %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -714,145 +730,145 @@ msgstr ""
"ADVARSEL: Flgende kjernepakker vil bli fjernet\n"
"Dette br IKKE gjres, med mindre du vet nyaktig hva du gjr!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nylig installerte, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installert p nytt, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Retter p avhengighetsforhold ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " mislyktes."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Klarer ikke rette p avhengighetsforholdene"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Klarer ikke minimere oppgraderingsettet"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Utfrt"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du vil kanskje kjre apt-get -f install for rette p dette."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Uinnfridde avhengighetsforhold - Prv -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!"
-#: 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 "Installer disse pakkene uten verifikasjon [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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: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 "Pakker trenges fjernes, men funksjonen er sltt av."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Det oppsto en intern feil nr avledningen ble lagt til"
-#: 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 "Klarer ikke lse nedlastingsmappa"
-#: 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 "Kan ikke lese kildlista."
-#: 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 "M hente %sB/%sB med arkiver.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Ja, gjr som jeg sier!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -863,28 +879,28 @@ msgstr ""
"For fortsette, skriv: %s\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
-#: 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?"
@@ -892,48 +908,48 @@ msgstr ""
"Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller "
"--fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og bytte av media stttes n ikke"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Klarer ikke rette p manglende pakker."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Avbryter istallasjonen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -944,49 +960,49 @@ msgstr ""
"Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n"
"tilgjengelig fra en annen kilde.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Flgende pakker erstatter den imidlertid:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Pakken %s har ingen installasjonskandidat"
-#: 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 "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kan ikke lse listemappa"
-#: 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."
@@ -994,25 +1010,25 @@ msgstr ""
"Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
"ble brukt isteden. "
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Klarte ikke finne pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
-#: 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)."
@@ -1020,7 +1036,7 @@ msgstr ""
"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
"angi en lsning)."
-#: 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"
@@ -1032,7 +1048,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: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"
@@ -1042,122 +1058,127 @@ msgstr ""
"at pakken helt enkelt ikke kan installeres, og du br fylle ut en "
"feilmelding."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "delagte pakker"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Flgende ekstra pakker vil bli installert."
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Foresltte pakker:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Anbefalte pakker"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Beregner oppgradering... "
-#: 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 "Mislyktes"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Utfrt"
-#: 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 "Intern feil - AllUpgrade dela noe"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Skaffer kildekode %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Klarte ikke skaffe alle arkivene."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislyktes.\n"
-#: 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 "Byggekommandoen %s mislyktes.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Barneprosessen mislyktes"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen avhengigheter.\n"
-#: 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 "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
-#: 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 "
@@ -1166,32 +1187,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Klarte ikke behandle forutsetningene for bygging"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Stttede moduler:"
-#: 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"
@@ -1446,7 +1467,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 +1520,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"
@@ -1806,7 +1828,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1938,76 +1960,76 @@ msgstr "Klarte ikke pne rr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fra %s-prosessen"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Venter p hoder"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "delagt hodelinje"
-#: 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 "HTTP-tjeneren sendte et ugyldig svarhode"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ukjent datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Utvalget mislykkes"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsavbrudd p forbindelsen"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Feil ved lesing fra tjeneren"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "delagte hodedata"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Forbindelsen mislykkes"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Intern feil"
@@ -2020,7 +2042,7 @@ msgstr "Kan ikke utfre 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 +2163,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"
@@ -2308,52 +2330,52 @@ msgstr "Klarer ikke fortolke pakkefila %s (1)"
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)"
@@ -2403,7 +2425,7 @@ msgstr "Listemappa %spartial mangler."
msgid "Archive directory %spartial is missing."
msgstr "Arkivmappa %spartial mangler."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2426,12 +2448,12 @@ msgstr ""
" %s\n"
"i %s og trykk Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet %s stttes ikke"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarer ikke bestemme en passende pakkesystemtype"
@@ -2551,11 +2573,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Feil MD5sum"
-#: 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 "
@@ -2564,7 +2586,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2573,13 +2595,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:814
#, 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:901
msgid "Size mismatch"
msgstr "Feil strrelse"
diff --git a/po/nl.po b/po/nl.po
index ac95a305c..8fcffe797 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-01-04 18:51+0100\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"
@@ -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 voor %s %s gecompileerd op %s %s\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"
@@ -518,12 +534,12 @@ msgstr "Status opvragen van %s is mislukt"
msgid "Archive had no package field"
msgstr "Archief heeft geen 'package'-veld"
-#: 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 " %s heeft geen voorrangsingang\n"
-#: 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 beheerder is %s, niet %s\n"
@@ -623,79 +639,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:120
msgid "Y"
msgstr "J"
-#: 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 "Regex-compilatiefout - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "De volgende pakketten hebben niet-voldane vereisten:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "maar %s is genstalleerd"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "maar %s zal genstalleerd worden"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "maar het is niet installeerbaar"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "maar het is een virtueel pakket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "maar het is niet genstalleerd"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "maar het zal niet genstalleerd worden"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " of"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "De volgende NIEUWE pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "De volgende pakketten zullen VERWIJDERD worden:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "De volgende pakketten zijn achtergehouden:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "De volgende pakketten zullen opgewaardeerd worden:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "De volgende pakketten zullen GEDEGRADEERD worden:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (wegens %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -704,145 +720,145 @@ msgstr ""
"WAARSCHUWING: De volgende essentile 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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten genstalleerd, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu opnieuw genstalleerd, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu gedegradeerd, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakketten niet volledig genstalleerd of verwijderd.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Vereisten worden verbeterd..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " mislukt."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Kan vereisten niet verbeteren"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Klaar"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
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: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 "Wilt u deze pakketten installeren zonder verificatie [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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: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 "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, 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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "De lijst van bronnen kon niet gelezen worden."
-#: 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 "Er moeten %sB/%sB aan archieven opgehaald worden.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Ja, doe wat ik zeg!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -853,28 +869,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:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Afbreken."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -882,49 +898,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Geen oplossing voor de missende pakketten gevonden."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Installatie wordt afgebroken."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"%s wordt overgeslagen, het is al genstalleerd en opwaardering is niet "
"gevraagd.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakket %s is niet genstalleerd, en wordt dus niet verwijderd\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Genstalleerd]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -935,50 +951,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:1110
msgid "However the following packages replace it:"
msgstr "Echter, de volgende pakketten vervangen dit:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kon de lijst-map niet vergrendelen"
-#: 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."
@@ -986,27 +1002,27 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Kon pakket %s niet vinden"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1014,7 +1030,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: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"
@@ -1025,7 +1041,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: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"
@@ -1035,119 +1051,124 @@ 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
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Niet-werkende pakketten:"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "De volgende extra pakketten zullen genstalleerd worden:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Voorgestelde pakketten:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Aanbevolen pakketten:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Opwaardering wordt doorgerekend... "
-#: 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 "Mislukt"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Klaar"
-#: 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 "Interne fout, AllUpgrade heeft dingen stukgemaakt"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Ophalen bron %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Ophalen van sommige archieven is mislukt."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uitpakopdracht '%s' is mislukt.\n"
-#: 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 "Bouwopdracht '%s' is mislukt.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Dochterproces is mislukt"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s heeft geen bouwvereisten.\n"
-#: 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 "
@@ -1156,7 +1177,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1165,32 +1186,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:2308
#, 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: genstalleerde versie %s "
"is te nieuw"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Verwerken van de bouwvereisten is mislukt"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Ondersteunde modules:"
-#: 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"
@@ -1454,7 +1475,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 +1528,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"
@@ -1814,7 +1836,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Probleem bij het hashen van het bestand"
@@ -1946,79 +1968,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:381
msgid "Waiting for headers"
msgstr "Wachtend op de kopteksten"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Foute koptekstregel"
-#: 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 "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Onbekend datumformaat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Selectie is mislukt"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Verbinding verliep"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fout bij het schrijven naar het uitvoerbestand"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Fout bij het schrijven naar bestand"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Fout bij het schrijven naar het bestand"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Fout bij het lezen van de server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Foute koptekstdata"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Verbinding mislukt"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Interne fout"
@@ -2031,7 +2053,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 +2178,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"
@@ -2326,52 +2348,52 @@ msgstr "Kon pakketbestand %s niet ontleden (1)"
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)"
@@ -2423,7 +2445,7 @@ msgstr "Lijstmap %spartial is afwezig."
msgid "Archive directory %spartial is missing."
msgstr "Archiefmap %spartial is afwezig."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2446,12 +2468,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:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakketbeheersysteem '%s' wordt niet ondersteund"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kan geen geschikt pakketsysteemtype bepalen"
@@ -2575,11 +2597,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum komt niet overeen"
-#: 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 "
@@ -2588,7 +2610,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,7 +2619,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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2605,7 +2627,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:901
msgid "Size mismatch"
msgstr "Grootte komt niet overeen"
diff --git a/po/nn.po b/po/nn.po
index 221677577..4f9ecb637 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-01-04 18:51+0100\n"
"PO-Revision-Date: 2005-02-14 23:30+0100\n"
"Last-Translator: Hvard Korsvoll <korsvoll@skulelinux.no>\n"
"Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -151,7 +151,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 for %s %s kompilert p %s %s\n"
@@ -230,6 +230,22 @@ msgstr ""
" -o=? Set ei vilkrleg 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"
@@ -512,12 +528,12 @@ msgstr "Klarte ikkje f status til %s"
msgid "Archive had no package field"
msgstr "Arkivet har ikkje noko pakkefelt"
-#: 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 " %s har inga overstyringsoppfring\n"
-#: 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-vedlikehaldaren er %s, ikkje %s\n"
@@ -617,79 +633,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:120
msgid "Y"
msgstr "J"
-#: 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 "Regex-kompileringsfeil - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Flgjande pakkar har krav som ikkje er oppfylte:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "men %s er installert"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skal installerast"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "men lt seg ikkje installera"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "men er ein virtuell pakke"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "men er ikkje installert"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "men skal ikkje installerast"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Dei flgjande NYE pakkane vil verta installerte:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Dei flgjande pakkane vil verta FJERNA:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Dei flgjande pakkane er haldne tilbake:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Dei flgjande pakkane vil verta oppgraderte:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Dei flgjande pakkane vil verta NEDGRADERTE:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Dei flgjande pakkane som er haldne tilbake vil verta endra:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (fordi %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -698,146 +714,146 @@ msgstr ""
"TVARING: Dei flgjande ndvendige pakkane vil verta fjerna.\n"
"Dette br IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu oppgraderte, %lu nyleg installerte, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu installerte p nytt, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderte, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Rettar p krav ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " mislukkast."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Klarte ikkje retta p krav"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Klarte ikkje minimera oppgraderingsmengda"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Ferdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr ""
"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nokre krav er ikkje oppfylte. Prv med -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "TVARING: Klarer ikkje autentisere desse pakkane."
-#: 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 "Installer desse pakkane utan verifikasjon [j/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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: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 "Nokre pakkar m fjernast, men fjerning er sltt av."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, 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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Klarte ikkje lsa nedlastingskatalogen"
-#: 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 "Kjeldelista kan ikkje lesast."
-#: 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 "M henta %sB/%sB med arkiv.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Ja, gjer som eg seier!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +864,28 @@ msgstr ""
"For halda fram, m du skriva nyaktig %s.\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Avbryt."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Nedlastinga er ferdig i nedlastingsmodus"
-#: 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?"
@@ -877,49 +893,49 @@ msgstr ""
"Klarte ikkje henta nokre av arkiva. Du kan prva med apt-get update eller "
"--fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing og byte av medium er ikkje sttta for tida"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Klarte ikkje retta opp manglande pakkar."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Avbryt installasjon."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Hoppar over %s, for den er installert fr fr og ikkje sett til "
"oppgradering.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Installert]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -930,49 +946,49 @@ msgstr ""
"av ein annan pakke. Dette tyder at pakket manglar, er gjort overfldig\n"
"eller er berre tilgjengeleg fr ei anna kjelde\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Dei flgjande pakkane kan brukast i staden:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Den nyaste versjonen av %s er installert fr fr.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Fann ikkje utgva %s av %s"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Klarte ikkje lsa listekatalogen"
-#: 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."
@@ -980,26 +996,26 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Fann ikkje pakken %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr ""
"Du vil kanskje prva retta p desse ved kyra apt-get -f install."
-#: 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)."
@@ -1007,7 +1023,7 @@ msgstr ""
"Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja "
"ei lysing)."
-#: 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"
@@ -1019,7 +1035,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: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"
@@ -1029,122 +1045,127 @@ msgstr ""
"pakken rett og slett ikkje lt seg installera. I sfall br du senda\n"
"feilmelding."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "ydelagde pakkar"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Dei flgjande tilleggspakkane vil verta installerte:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Fresltte pakkar:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Tilrdde pakkar"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Reknar ut oppgradering ... "
-#: 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 "Mislukkast"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Ferdig"
-#: 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 "Intern feil. AllUpgrade ydelagde noko"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Hent kjeldekode %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Klarte ikkje henta nokre av arkiva."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Utpakkingskommandoen %s mislukkast.\n"
-#: 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 "Byggjekommandoen %s mislukkast.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Barneprosessen mislukkast"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har ingen byggjekrav.\n"
-#: 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 "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
-#: 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 "
@@ -1153,31 +1174,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Klarte ikkje behandla byggjekrava"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Sttta modular:"
-#: 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"
@@ -1430,7 +1451,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 +1504,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"
@@ -1789,7 +1811,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem ved oppretting av nkkel for fil"
@@ -1921,76 +1943,76 @@ msgstr "Klarte ikkje opna ryr for %s"
msgid "Read error from %s process"
msgstr "Lesefeil fr %s-prosessen"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Ventar p hovud"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "ydelagd hovudlinje"
-#: 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 "HTTP-tenaren sende eit ugyldig svarhovud"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Ukjend datoformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Utvalet mislukkast"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsavbrot p sambandet"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Feil ved skriving til utfil"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Feil ved skriving til fil"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Feil ved skriving til fila"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Feil ved lesing fr tenaren"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "ydelagde hovuddata"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Sambandet mislukkast"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Intern feil"
@@ -2003,7 +2025,7 @@ msgstr "Kan ikkje utfra 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 +2146,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"
@@ -2291,52 +2313,52 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
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)"
@@ -2387,7 +2409,7 @@ msgstr "Listekatalogen %spartial manglar."
msgid "Archive directory %spartial is missing."
msgstr "Arkivkatalogen %spartial manglar."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2410,12 +2432,12 @@ msgstr ""
" %s\n"
"i stasjonen %s og trykk Enter.\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Pakkesystemet %s er ikkje sttta"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
@@ -2534,11 +2556,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Feil MD5-sum"
-#: 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 "
@@ -2547,7 +2569,7 @@ msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv "
"(fordi arkitekturen manglar)."
-#: 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 "
@@ -2555,14 +2577,14 @@ msgid ""
msgstr ""
"Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv."
-#: 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 ""
"Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Feil storleik"
diff --git a/po/pl.po b/po/pl.po
index 457116536..766046b67 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,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-01-04 18:51+0100\n"
"PO-Revision-Date: 2005-02-11 11:47+0100\n"
"Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
"Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -149,7 +149,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 dla %s %s skompilowany %s %s\n"
@@ -230,6 +230,22 @@ msgstr ""
"Wicej informacji mona znale na stronach podrcznika 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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Zmiana nonika: Prosz woy dysk oznaczony\n"
+" '%s'\n"
+"do napdu '%s' i nacisn 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 "Argumenty nie s w parach"
@@ -515,12 +531,12 @@ msgstr "Nie udao si wykona operacji stat na %s"
msgid "Archive had no package field"
msgstr "Archiwum nie posiadao pola pakietu"
-#: 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 " %s nie posiada wpisu w pliku override\n"
-#: 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 " opiekunem %s jest %s, a nie %s\n"
@@ -620,79 +636,79 @@ msgstr "Problem przy usuwaniu %s"
msgid "Failed to rename %s to %s"
msgstr "Nie udao si zmieni nazwy %s na %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "T"
-#: 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 "Bd kompilacji wyraenia regularnego - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Nastpujce pakiety maj niespenione zalenoci:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "ale %s jest zainstalowany"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "ale %s ma zosta zainstalowany"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "ale nie da si go zainstalowa"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ale jest pakietem wirtualnym"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ale nie jest zainstalowany"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "ale nie zostanie zainstalowany"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " lub"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Zostan zainstalowane nastpujce NOWE pakiety:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Nastpujce pakiety zostan USUNITE:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Nastpujce pakiety zostay zatrzymane:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Nastpujce pakiety zostan zaktualizowane:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Zostan zainstalowane STARE wersje nastpujcych pakietw:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Zostan zmienione nastpujce zatrzymane pakiety:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (z powodu %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -701,144 +717,144 @@ msgstr ""
"UWAGA: Zostan usunite nastpujce istotne pakiety\n"
"Nie powinno si tego robi, chyba e dokadnie wiesz, co robisz!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu aktualizowanych, %lu nowo instalowanych, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu przeinstalowywanych, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu cofnitych wersji, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu nie w peni zainstalowanych lub usunitych.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Naprawianie zalenoci..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " nie udao si."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Nie udao si naprawi zalenoci"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Nie udao si zminimalizowa zbioru aktualizacji"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Gotowe"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Naley uruchomi `apt-get -f install', aby je naprawi."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Niespenione zalenoci. Sprbuj uy -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "UWAGA: Nastpujce pakiety nie mog zosta zweryfikowane!"
-#: 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 "Zainstalowa te pakiety bez weryfikacji [t/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Niektre pakiety nie mogy zosta zweryfikowane"
-#: 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 "Byy problemy, a uyto -y bez --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 "Pakiety powinny zosta usunite, ale Remove jest wyczone."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Bd wewntrzny przy dodawaniu objazdu"
-#: 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 "Nie udao si zablokowa katalogu pobierania"
-#: 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 "Nie udao si odczyta list rde."
-#: 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 "Konieczne pobranie %sB/%sB archiww.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Konieczne pobranie %sB archiww.\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 "Po rozpakowaniu zostanie dodatkowo uyte %sB miejsca na dysku.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Niestety w %s nie ma wystarczajcej iloci wolnego miejsca."
-#: 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 "Nakazano wykonywa tylko trywialne operacje, a to nie jest trywialne."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Tak, rb jak mwi!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -849,28 +865,28 @@ msgstr ""
"Aby kontynuowa wpisz zdanie '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Przerwane."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Nie udao si pobra %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Nie udao si pobra niektrych plikw"
-#: 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 "Ukoczono pobieranie w trybie samego pobierania"
-#: 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?"
@@ -878,48 +894,48 @@ msgstr ""
"Nie udao si pobra niektrych archiww, sprbuj uruchomi apt-get update "
"lub uy opcji --fix-missing"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing i zamienianie nonikw nie jest obecnie obsugiwane"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Nie udao si poprawi brakujcych pakietw."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Przerywanie instalacji"
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
"Pomijanie %s, jest ju zainstalowane, a nie zostao wybrana aktualizacja.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Pakiet %s nie jest zainstalowany, wic nie zostanie usunity.\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Zainstalowany]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Naley jednoznacznie wybra jeden z nich do instalacji."
-#: 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"
@@ -930,50 +946,50 @@ msgstr ""
"Zazwyczaj oznacza to, e pakietu brakuje, zosta zastpiony przez inny\n"
"pakiet lub nie jest dostpny przy pomocy obecnie ustawionych rde.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Jednak nastpujce pakiety go zastpuj:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr ""
"Przeinstalowanie pakietu %s nie jest moliwe, nie moe on zosta pobrany.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Wydanie '%s' dla '%s' nie zostao znalezione"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Wersja '%s' dla '%s' nie zostaa znaleziona"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, 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:1313
msgid "The update command takes no arguments"
msgstr "Polecenie update nie wymaga adnych argumentw"
-#: 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 "Nie udao si zablokowa katalogu list"
-#: 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."
@@ -981,25 +997,25 @@ msgstr ""
"Nie udao si pobra niektrych plikw indeksu, zostay one zignorowane lub "
"zostaa uyta ich starsza wersja."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: 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 "Nie udao si odnale pakietu %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Uwaga, wybieranie %s za wyraenie '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Naley uruchomi `apt-get -f install', aby je naprawi:"
-#: 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)."
@@ -1007,7 +1023,7 @@ msgstr ""
"Niespenione zalenoci. Sprbuj 'apt-get -f install' bez pakietw (lub "
"podaj rozwizanie)."
-#: 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"
@@ -1019,7 +1035,7 @@ msgstr ""
"niestabilnej, w ktrej niektre pakiety nie zostay jeszcze utworzone\n"
"lub przeniesione z katalogu Incoming (\"Przychodzce\")."
-#: 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"
@@ -1029,120 +1045,125 @@ msgstr ""
"danego pakietu po prostu nie da si zainstalowa i naley zgosi w nim\n"
"bd."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Nastpujce informacje mog pomc rozpozna sytuacj:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Pakiety s bdne"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Zostan zainstalowane nastpujce dodatkowe pakiety:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Sugerowane pakiety:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Polecane pakiety:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Obliczanie aktualizacji..."
-#: 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 "Nie udao si"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Gotowe"
-#: 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 "Bd wewntrzny, AllUpgrade wszystko popsuo"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pobrane "
"rda"
-#: 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 "Nie udao si odnale rda dla pakietu %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "W %s nie ma wystarczajcej iloci wolnego miejsca"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Konieczne pobranie %sB/%sB archiww rde.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Konieczne pobranie %sB archiww rde.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Pobierz rdo %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Nie udao si pobra niektrych archiww."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Pomijanie rozpakowania ju rozpakowanego rda w %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Polecenie rozpakowania '%s' zawiodo.\n"
-#: 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 "Polecenie budowania '%s' zawiodo.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Proces potomny zawid"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Naley poda przynajmniej jeden pakiet, dla ktrego maj zosta pakiety "
"wymagane do budowania"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr ""
"Nie udao si pobra informacji o zalenociach na czas budowania dla %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s nie ma zalenoci czasu budowania.\n"
-#: 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 "
@@ -1151,7 +1172,7 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa nie znaleziono "
"pakietu %s"
-#: 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 "
@@ -1160,32 +1181,32 @@ msgstr ""
"Zaleno %s od %s nie moe zosta speniona, poniewa adna z dostpnych "
"wersji pakietu %s nie ma odpowiedniej wersji"
-#: 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 ""
"Nie udao si speni zalenoci %s od %s: Zainstalowany pakiet %s jest zbyt "
"nowy"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Nie udao si speni zalenoci %s od %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Nie udao si speni zalenoci na czas budowania od %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Nie udao si przetworzy zalenoci na czas budowania"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Obsugiwane moduy:"
-#: 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"
@@ -1442,7 +1463,7 @@ msgstr "Zduplikowany plik konfiguracyjny %s/%s"
msgid "Failed to write file %s"
msgstr "Nie udao 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 udao si zamkn pliku %s"
@@ -1495,7 +1516,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 mona czyta %s"
@@ -1799,7 +1821,7 @@ msgstr "Przekroczony czas poczenia gniazda danych"
msgid "Unable to accept connection"
msgstr "Nie udao si przyj poczenia"
-#: 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 "Nie udao si obliczy skrtu pliku"
@@ -1931,76 +1953,76 @@ msgstr "Nie udao si otworzy potoku dla %s"
msgid "Read error from %s process"
msgstr "Bd odczytu z procesu %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Oczekiwanie na nagwki"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Otrzymano pojedyncz lini nagwka o dugoci ponad %u znakw"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Nieprawidowa linia nagwka"
-#: 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 "Serwer HTTP przysa nieprawidowy nagwek odpowiedzi"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Serwer HTTP przysa nieprawidowy nagwek Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ten serwer HTTP nieprawidowo obsuguje zakresy (ranges)"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Nieznany format daty"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Operacja select nie powioda si"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Przekroczenie czasu poczenia"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Bd przy pisaniu do pliku wyjciowego"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Bd przy pisaniu do pliku"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Bd czytania z serwera: Zdalna strona zamkna poczenie"
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Bd czytania z serwera"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Bdne dane nagwka"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Poczenie nie udao si"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Bd wewntrzny"
@@ -2013,7 +2035,7 @@ msgstr "Nie mona wykona mmap na pustym pliku"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Nie udao si wykona mmap %lu bajtw"
-#: 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 +2157,7 @@ msgstr "Nieprawidowa operacja %s"
msgid "Unable to stat the mount point %s"
msgstr "Nie udao 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 udao si przej do %s"
@@ -2302,52 +2324,52 @@ msgstr "Nie udao si zanalizowa pliku pakietu %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Nie udao 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 "Nieprawidowa linia %lu w licie rde %s (URI)"
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Nieprawidowa linia %lu w licie rde %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 "Nieprawidowa linia %lu w licie rde %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 "Nieprawidowa linia %lu w licie rde %s (bezwzgldna dystrybucja)"
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr "Nieprawidowa linia %lu w licie rde %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 licie rde %s jest zbyt duga."
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Nieprawidowa linia %u w licie rde %s (typ)"
-#: 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' jest nieznany - linia %u listy rde %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 "Nieprawidowa linia %u w licie rde %s (identyfikator producenta)"
@@ -2398,7 +2420,7 @@ msgstr "Brakuje katalogu list %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Brakuje katalogu archiww %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2421,12 +2443,12 @@ msgstr ""
" '%s'\n"
"do napdu '%s' i nacisn enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "System pakietw '%s' nie jest obsugiwany"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nie udao si okreli odpowiedniego typu systemu pakietw"
@@ -2549,11 +2571,11 @@ msgstr "Bd wejcia/wyjcia przy zapisywaniu podrcznego magazynu rde"
msgid "rename failed, %s (%s -> %s)."
msgstr "nie udao 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:911
msgid "MD5Sum mismatch"
msgstr "Bdna suma MD5"
-#: 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 "
@@ -2562,7 +2584,7 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet (z powodu brakujcej architektury)."
-#: 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 "
@@ -2571,14 +2593,14 @@ msgstr ""
"Nie udao si odnale pliku dla pakietu %s. Moe to oznacza, e trzeba "
"bdzie rcznie naprawi ten pakiet."
-#: 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 ""
"Pliki indeksu pakietw s uszkodzone. Brak pola Filename: dla pakietu %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Bdny rozmiar"
diff --git a/po/pt.po b/po/pt.po
index 5f8541a67..770803c52 100644
--- a/po/pt.po
+++ b/po/pt.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-01-04 18:51+0100\n"
"PO-Revision-Date: 2005-03-07 22:20+0000\n"
"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\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 para %s %s compilado em %s %s\n"
@@ -227,6 +227,21 @@ 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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, 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"
+
+#: 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 "Argumentos não estão em pares"
@@ -511,12 +526,12 @@ msgstr "Falha ao executar stat %s"
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:394 ftparchive/writer.cc:603
#, 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:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " maintainer de %s é %s, não %s\n"
@@ -616,79 +631,79 @@ 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:120
msgid "Y"
msgstr "S"
-#: 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 "Erro de compilação de regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, c-format
msgid "but %s is installed"
msgstr "mas %s está instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
msgstr "mas não está instalável"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "mas é um pacote virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "mas não está instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:346
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
msgstr "Os seguintes pacotes serão REMOVIDOS:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "Os seguintes pacotes serão actualizados:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Aos seguintes pacotes será feito o DOWNGRADE :"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (devido a %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -698,145 +713,145 @@ msgstr ""
"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a "
"fazer!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, 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:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu a que foi feito o downgrade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Corrigindo dependências..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Impossível corrigir dependências"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Feito"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dependências não satisfeitas. Tente utilizar -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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: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 "Instalar estes pacotes sem verificação [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes não poderam ser autenticados"
-#: 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 "Há problemas e -y foi usado sem --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 "Pacotes precisam de ser removidos mas Remove está desabilitado."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno ao adicionar um desvio"
-#: 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 "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: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 "A lista de fontes não pôde ser lida."
-#: 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 "É necessário fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Desculpe, você não tem espaço suficiente em %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Sim, faça como eu digo!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -847,28 +862,28 @@ msgstr ""
"Para continuar escreva a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -876,47 +891,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Impossível corrigir os pacotes em falta."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Abortando a Instalação."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Você deve selecionar explicitamente um para instalar."
-#: 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"
@@ -927,51 +942,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:1110
msgid "However the following packages replace it:"
msgstr "No entanto, os seguintes pacotes substituem-o:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
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:1384
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -979,25 +994,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossível encontrar o pacote %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1005,7 +1020,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: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"
@@ -1017,7 +1032,7 @@ msgstr ""
"distribuição instável, que alguns pacotes requesitados ainda não foram \n"
"criados ou foram tirados do Incoming."
-#: 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"
@@ -1028,119 +1043,125 @@ msgstr ""
"de\n"
"bug sobre esse pacote."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Pacotes estragados"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Calculando Actualização... "
-#: 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 "Falhou"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Pronto"
-#: 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 "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr ""
+"Saltando a descompactação de pacote código fonte já descompactado em %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Código Fonte %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Falha ao obter alguns arquivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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: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 "O comando de compilação '%s' falhou.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "O processo filho falhou"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1149,7 +1170,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1158,32 +1179,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 requesitos de versão"
-#: 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 ""
"Falha ao satisfazer a dependência %s para %s: Pacote instalado %s é muito "
"novo"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, 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:2347
#, 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:2351
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:2383
msgid "Supported modules:"
msgstr "Módulos Suportados:"
-#: 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"
@@ -1441,7 +1462,7 @@ msgstr "Arquivo de configuração duplicado %s/%s"
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"
@@ -1494,7 +1515,8 @@ msgid "File %s/%s overwrites the one in the package %s"
msgstr "Ficheiro %s/%s sobreescreve 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"
@@ -1797,7 +1819,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problema fazendo o hash do ficheiro"
@@ -1929,76 +1951,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:381
msgid "Waiting for headers"
msgstr "Aguardando por cabeçalhos"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Linha de cabeçalho errada"
-#: 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 "O servidor http enviou um cabeçalho de resposta inválido"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range errado"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Select falhou."
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "A ligação expirou"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Erro gravando para ficheiro de saída"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Erro gravando para ficheiro"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Erro gravando para o ficheiro"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Dados de cabeçalho errados"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Falhou a ligação"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Erro interno"
@@ -2011,7 +2033,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 +2156,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"
@@ -2301,52 +2323,52 @@ msgstr "Impossível o parse ao ficheiro de pacote %s (1)"
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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, 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)"
@@ -2398,7 +2420,7 @@ msgstr "Falta directório de listas %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Falta o diretório de repositório %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2421,12 +2443,12 @@ msgstr ""
" '%s'\n"
"na drive '%s' e pressione enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"Não foi possível determinar um tipo de sistema de empacotamento aplicável"
@@ -2552,11 +2574,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: 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 "
@@ -2566,7 +2588,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2575,7 +2597,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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2583,7 +2605,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:901
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2824,12 +2846,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..317b14e7c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-01-04 18:51+0100\n"
"PO-Revision-Date: 2005-06-16 10:24-0300\n"
"Last-Translator: Andr Lus Lopes <andrelop@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -149,7 +149,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 para %s %s compilado em %s %s\n"
@@ -229,6 +229,21 @@ msgstr ""
"Veja as pginas de manual apt-cache(8) e apt.conf(5) para maiores "
"informaes.\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 ""
+"Troca de mdia: Por favor insira o disco nomeado '%s' no drive '%s' e "
+"pressione 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 "Argumentos no esto em pares"
@@ -513,12 +528,12 @@ msgstr "Falha ao checar %s"
msgid "Archive had no package field"
msgstr "Repositrio no possua campo pacote"
-#: 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 " %s no possui entrada override\n"
-#: 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 " mantenedor de %s %s, no %s\n"
@@ -618,79 +633,79 @@ 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:120
msgid "Y"
msgstr "S"
-#: 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 "Erro de compilao de regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Os pacotes a seguir tm dependncias desencontradas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "mas %s est instalado"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
msgstr "mas no est instalvel"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "mas um pacote virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "mas no est instalado"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "mas no vai ser instalado"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " ou"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Os NOVOS pacotes a seguir sero instalados:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Os pacotes a seguir sero REMOVIDOS:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Os pacotes a seguir sero mantidos em suas verses atuais :"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Os pacotes a seguir sero atualizados :"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Os pacotes a seguir sero REBAIXADOS de verso :"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Os pacotes segurados a seguir sero mudados :"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (por causa de %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -699,145 +714,145 @@ msgstr ""
"AVISO: Os pacotes essenciais a seguir sero removidos\n"
"Isso NO deve ser feito a menos que voc saiba exatamente o que est fazendo!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, 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:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalados, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu desatualizados, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu a serem removidos e %lu no atualizados.\n"
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu pacotes no totalmente instalados ou removidos.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Corrigindo dependncias..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " falhou."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Impossvel corrigir dependncias"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Impossvel minimizar o conjunto de atualizaes"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Pronto"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Dependncias desencontradas. Tente usar -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "AVISO : Os pacotes a seguir no podem ser autenticados !"
-#: 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 "Instalar estes pacotes sem verificao [s/N] ? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
msgid "Some packages could not be authenticated"
msgstr "Alguns pacotes no puderam ser autenticados"
-#: 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 "H problemas e -y foi usado sem --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 "Pacotes precisam ser removidos mas a remoo est desabilitada."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Erro Interno ao adicionar um desvio"
-#: 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 "Impossvel criar lock no diretrio de download"
-#: 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 "A lista de fontes no pde ser lida."
-#: 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 " preciso fazer o download de %sB/%sB de arquivos.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr ""
"Depois de desempacotamento, %sB adicionais de espao em disco sero usados.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Depois de desempacotar, %sB de espao em disco sero liberados.\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 "Desculpe, voc no tem espao suficiente em %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Voc no possui espao suficiente em %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 "Triviais Apenas especificado mas essa no uma operao trivial."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Sim, faa o que eu digo!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -848,28 +863,28 @@ msgstr ""
"Para continuar digite a frase '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abortado."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -877,47 +892,47 @@ msgstr ""
"Impossvel pegar alguns arquivos, talvez rodar apt-get update ou tentar com "
"--fix-missing?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing e troca de mdia no so suportados atualmente"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Impossvel corrigir pacotes faltosos."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Abortando Instalao."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Nota, selecionando %s ao invs de %s\n"
-#: 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 "Pulando %s, j est instalado e a atualizao no est configurada.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "O pacote %s no est instalado, ento no ser removido\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instalado]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -928,51 +943,51 @@ msgstr ""
"Isso pode significar que o pacote est faltando, ficou obsoleto ou\n"
"est disponvel somente a partir de outra fonte\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
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:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "O pacote %s no tem candidato para instalao"
-#: 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 ""
"A reinstalao de %s no possvel, o download do mesmo no pode ser "
"feito.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s j a verso mais nova.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Release '%s' para '%s' no foi encontrada"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Verso '%s' para '%s' no foi encontrada"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Verso selecionada %s (%s) para %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "O comando update no leva argumentos"
-#: 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 "Impossvel criar lock no diretrio de listas"
-#: 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."
@@ -980,25 +995,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Impossvel achar pacote %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Nota, selecionando %s para expresso regular '%s'\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1006,7 +1021,7 @@ msgstr ""
"Dependncias desencontradas. Tente `apt-get -f install' sem nenhum pacote "
"(ou especifique uma soluo)."
-#: 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"
@@ -1018,7 +1033,7 @@ msgstr ""
"distribuio instvel, que alguns pacotes requeridos no foram \n"
"criados ainda ou foram tirados do Incoming."
-#: 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"
@@ -1028,117 +1043,122 @@ msgstr ""
"esteja simplesmente no instalvel e um relato de erro sobre esse\n"
"pacotes deve ser enviado."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "A informao a seguir pode ajudar a resolver a situao:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Pacotes quebrados"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Os pacotes extra a seguir sero instalados:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Pacotes sugeridos :"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Pacotes recomendados :"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Calculando Atualizao... "
-#: 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 "Falhou"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Pronto"
-#: 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 "Erro Interno, AllUpgrade quebrou as coisas"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Impossvel encontrar um pacote fonte para %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Pulando desempacotamento de pacote fonte j desempacotado em %s\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Voc no possui espao livre suficiente em %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Obter Fonte %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Falha ao fazer o download de alguns arquivos."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Comando de desempacotamento '%s' falhou.\n"
-#: 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 "Comando de construo '%s' falhou.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Processo filho falhou"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Deve-se especificar pelo menos um pacote para que se cheque as dependncias "
"de construo"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Impossvel conseguir informaes de dependncia de construo para %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s no tem dependncias de construo.\n"
-#: 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 "
@@ -1147,7 +1167,7 @@ msgstr ""
"a dependncia de %s por %s no pde ser satisfeita porque o pacote %s no "
"pde ser encontrado"
-#: 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 "
@@ -1156,32 +1176,32 @@ msgstr ""
"a dependncia de %s por %s no pode ser satisfeita porque nenhuma verso "
"disponvel do pacote %s pode satisfazer os requerimentos de verso"
-#: 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 ""
"Falha ao satisfazer a dependncia %s para %s: Pacote instalado %s muito "
"novo"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Falha ao satisfazer dependncia %s para %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "No foi possvel satisfazer as dependncias de compilao para %s."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Falha ao processar as dependncias de construo"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Mdulos Suportados:"
-#: 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"
@@ -1438,7 +1458,7 @@ msgstr "Arquivo de confgiurao duplicado %s/%s"
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 +1511,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 "Impossvel ler %s"
@@ -1797,7 +1818,7 @@ msgstr "Conexo do socket de dados expirou"
msgid "Unable to accept connection"
msgstr "Impossvel aceitar conexo"
-#: 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 "Problema fazendo o hash do arquivo"
@@ -1929,76 +1950,76 @@ msgstr "No foi possvel abrir pipe para %s"
msgid "Read error from %s process"
msgstr "Erro de leitura do processo %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Aguardando por cabealhos"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Recebi uma nica linha de cabealho acima de %u caracteres"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Linha de cabealho ruim"
-#: 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 "O servidor http enviou um cabealho de resposta invlido"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "O servidor http enviou um cabealho Conten-Length invlido"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "O servidor http enviou um cabealho Conten-Range invlido"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Este servidor http possui suporte a range quebrado"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Formato de data desconhecido"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Seleo falhou."
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Conexo expirou"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Erro gravando para arquivo de sada"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Erro gravando para arquivo"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Erro gravando para o arquivo"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Erro lendo do servidor Ponto remoto fechou a conexo"
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Erro lendo do servidor"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Dados de cabealho ruins"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Conexo falhou."
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Erro interno"
@@ -2011,7 +2032,7 @@ msgstr "No foi possvel fazer mmap de arquivo vazio"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Impossvel 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 "Seleo %s no encontrada"
@@ -2134,7 +2155,7 @@ msgstr "Operao %s invlida"
msgid "Unable to stat the mount point %s"
msgstr "Impossvel 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 "Impossvel mudar para %s"
@@ -2301,52 +2322,52 @@ msgstr "Impossvel analizar arquivo de pacote %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Impossvel 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 (distribuio)"
-#: 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 (anlise 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 (Distribuio 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 (anlise de distribuio)"
-#: 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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Tipo '%s' no 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)"
@@ -2398,7 +2419,7 @@ msgstr "Diretrio de listas %spartial est faltando."
msgid "Archive directory %spartial is missing."
msgstr "Diretrio de repositrio %spartial est faltando."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2421,12 +2442,12 @@ msgstr ""
" '%s'\n"
"no drive '%s' e pressione enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Sistema de empacotamento '%s' no suportado"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr ""
"No foi possvel determinar um tipo de sistema de empacotamento aplicvel."
@@ -2552,11 +2573,11 @@ msgstr "Erro de I/O ao gravar cache fonte"
msgid "rename failed, %s (%s -> %s)."
msgstr "renomeao 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum incorreto"
-#: 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 "
@@ -2566,7 +2587,7 @@ msgstr ""
"que voc precisa consertar manualmente este pacote. (devido a arquitetura "
"no especificada)."
-#: 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 "
@@ -2575,7 +2596,7 @@ msgstr ""
"No foi possvel 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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2583,7 +2604,7 @@ msgstr ""
"Os arquivos de ndice de pacotes esto corrompidos. Nenhum campo Filename: "
"para o pacote %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Tamanho incorreto"
@@ -2796,12 +2817,6 @@ msgstr "Conexo encerrada prematuramente"
#~ msgstr "Falha ao baixar %s %s\n"
#, fuzzy
-#~ msgid "Please insert a Disc in the drive and press enter"
-#~ msgstr ""
-#~ "Troca de mdia: Por favor insira o disco nomeado '%s' no drive '%s' e "
-#~ "pressione enter\n"
-
-#, fuzzy
#~ msgid "Couldn't wait for subprocess"
#~ msgstr "No foi possvel checar a lista de pacotes fonte %s"
diff --git a/po/ro.po b/po/ro.po
index d2f9e1360..ff3c6dfbc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt_po_ro\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: 2005-08-25 17:43+0300\n"
"Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
"Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
@@ -149,7 +149,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 pentru %s %s compilat pe %s %s\n"
@@ -228,6 +228,22 @@ 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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive 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"
+
+#: 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 "Argumentele nu sunt perechi"
@@ -519,12 +535,12 @@ msgstr "Eşuare în determinarea stării %s"
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:394 ftparchive/writer.cc:603
#, 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:437 ftparchive/writer.cc:689
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s responsabil este %s nu %s\n"
@@ -624,79 +640,79 @@ 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: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 "Eroare de compilare expresie regulată - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, c-format
msgid "but %s is installed"
msgstr "dar %s este instalat"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
msgstr "dar nu este instalabil"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "dar este un pachet virtual"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "dar nu este instalat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:346
msgid " or"
msgstr " sau"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
msgstr "Următoarele pachete vor fi ŞTERSE:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "Următoarele pachete vor fi ÎNNOITE:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Următoarele pachete vor fi DE-GRADATE:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (datorită %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -705,145 +721,145 @@ msgstr ""
"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
"Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu înnoite, %lu nou instalate, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinstalate, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu de-gradate, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Corectez dependenţele..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " eşuare."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Nu pot corecta dependenţele"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
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:660
msgid " Done"
msgstr " Terminat"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
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: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 "Instalaţi aceste pachete fără verificare [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
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: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 "Pachete trebuiesc şterse dar ştergerea este dezactivată."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Eroare internă în timpul adăugării unei diversiuni"
-#: 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 "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: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 "Lista surselor nu poate fi citită."
-#: 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 "Este nevoie să descărcaţi %sB/%sB de arhive.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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:832
#, 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
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Nu aveţi suficient spaţiu în %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Da, fă cum îţi spun!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -854,28 +870,28 @@ msgstr ""
"Pentru a continua tastaţi fraza '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Renunţare."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -883,47 +899,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Nu pot corecta pachetele lipsă."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Abandonez instalarea."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Instalat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -934,49 +950,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:1110
msgid "However the following packages replace it:"
msgstr "Oricum următoarele pachete îl înlocuiesc:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Nu pot încuia directorul cu lista"
-#: 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."
@@ -984,25 +1000,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Nu pot găsi pachetul %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1010,7 +1026,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: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"
@@ -1023,7 +1039,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: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"
@@ -1033,117 +1049,122 @@ 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
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Pachete deteriorate"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Pachete sugerate:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Pachete recomandate:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Calculez înnoirea... "
-#: 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 "Eşuare"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Terminat"
-#: 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 "Eroare internă, înnoire totală a defectat diverse chestiuni"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Sar peste despachetarea sursei deja despachetate în %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Aducere sursa %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Eşuare în a aduce unele arhive."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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: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 "Comanda de construire '%s' eşuată.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Eşuare proces copil"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1173,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,32 +1182,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Eşuare în a prelucra dependenţele înglobate"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Module suportate:"
-#: 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"
@@ -1445,7 +1466,7 @@ msgstr "Fişier de configurare duplicat %s/%s"
msgid "Failed to write file %s"
msgstr "Eşuare în a scrie fişierul %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 +1519,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"
@@ -1804,7 +1826,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problemă la indexarea fişierului"
@@ -1936,77 +1958,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:381
msgid "Waiting for headers"
msgstr "În aşteptarea antetelor"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Linie de antet necorespunzătoare"
-#: 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 "Serverul http a trimis un antet de răspuns necorespunzător"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Format de date necunoscut"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Eşuarea selecţiei"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Timp de conectare expirat"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Eroare la scrierea fişierului de rezultat"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Eroare la scrierea în fişier"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Eroare la scrierea în fişierul"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Eroare la citirea de pe server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Antet de date necorespunzător"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Conectare eşuată"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Eroare internă"
@@ -2019,7 +2041,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 +2164,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"
@@ -2309,52 +2331,52 @@ msgstr "Nu pot analiza fişierul pachet %s (1)"
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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, 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)"
@@ -2405,7 +2427,7 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2428,12 +2450,12 @@ msgstr ""
" '%s'\n"
"în unitatea '%s' şi apăsaţi Enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nu pot determina un tip de sistem de pachete potrivit"
@@ -2559,11 +2581,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Nepotrivire MD5Sum"
-#: 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 "
@@ -2572,7 +2594,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2581,7 +2603,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:814
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -2589,7 +2611,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:901
msgid "Size mismatch"
msgstr "Nepotrivire dimensiune"
diff --git a/po/ru.po b/po/ru.po
index 0c82a07d3..50cd1a91f 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.
#
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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-10-22 12:24+0400\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"
@@ -161,7 +157,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"
@@ -239,6 +235,19 @@ 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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
+
+#: 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 "Непарные аргументы"
@@ -337,7 +346,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 +386,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 +395,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 +430,7 @@ msgstr ""
" --contents Управление генерацией полного перечня содержимого пакетов\n"
" (файла Contents)\n"
" -c=? Использовать указанный конфигурационный файл\n"
-" -o=? Указать произвольную опцию"
+" -o=? Указать произвольный параметр конфигурации"
#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
@@ -534,12 +540,12 @@ msgstr "Не удалось получить атрибуты %s"
msgid "Archive had no package field"
msgstr "В архиве нет поля package"
-#: 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 " Нет записи о переназначении (override) для %s\n"
-#: 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"
@@ -640,264 +646,264 @@ msgstr "Не удалось удалить %s"
msgid "Failed to rename %s to %s"
msgstr "Не удалось переименовать %s в %s"
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
msgid "Y"
msgstr "д"
-#: 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 "Ошибка компиляции регулярного выражения - %s"
-#: 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
-#, fuzzy
+#: 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"
+"ВНИМАНИЕ: Эти существенно важные пакеты будут удалены.\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
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 ""
+msgstr "Аутентификационное предупреждение не принято в внимание.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "Установить эти пакеты без проверки [y/N]? "
-#: 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 ""
+"Внутренняя ошибка, InstallPackages была вызвана с неработоспособными "
+"пакетами!"
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:775
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: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 ""
+msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
-#: 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 "Необходимо скачать %sБ архивов.\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
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Недостаточно места в %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
-#, fuzzy, c-format
+#: 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"
+"То, что вы хотите сделать, может иметь нежелательные последствия.\n"
"Чтобы продолжить, введите фразу: '%s'\n"
" ?] "
-#: 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
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: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?"
@@ -905,48 +911,48 @@ msgstr ""
"Невозможно загрузить некоторые архивы, вероятно надо запустить apt-get "
"update или попытаться повторить запуск с ключом --fix-missing"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing и смена носителя в данный момент не поддерживаются"
-#: 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 "Заметьте, вместо %2$s выбирается %1$s\n"
-#: 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 ""
"Пропускается %s - пакет уже установлен, и опция upgrade не установлена.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Пакет %s - виртуальный, его функции предоставляются пакетами:\n"
-#: 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"
@@ -957,49 +963,49 @@ msgstr ""
"Это может означать, что пакет отсутствует, устарел, или доступен из "
"источников, не упомянутых в sources.list\n"
-#: 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 "Для пакета %s не найдены кандидаты на установку"
-#: 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 "Переустановка %s невозможна, он не загружается.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Уже установлена самая новая версия %s.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Релиз '%s' для '%s' не найден"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Версия '%s' для '%s' не найдена"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Выбрана версия %s (%s) для %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "Команде update не нужны аргументы"
-#: 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."
@@ -1007,27 +1013,27 @@ msgstr ""
"Некоторые индексные файлы не загрузились, они были проигнорированы или "
"вместо них были использованы старые версии"
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Внутренняя ошибка, AllUpgrade все поломал"
-#: 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 "Не могу найти пакет %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1035,7 +1041,7 @@ msgstr ""
"Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
"не указывая имени пакета, (или найдите другое решение)."
-#: 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"
@@ -1046,7 +1052,7 @@ msgstr ""
"или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
"ещё не созданы или были удалены из Incoming."
-#: 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"
@@ -1056,121 +1062,127 @@ msgstr ""
"пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
"Необходимо послать отчёт об этой ошибке."
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
-msgstr "Внутренняя ошибка, AllUpgrade все поломал"
+msgstr "Внутренняя ошибка, решатель проблем всё поломал"
-#: 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 "Невозможно найти пакет с исходными текстами для %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr ""
+"Распаковка исходных текстов пропущена, так как в %s уже находятся "
+"распакованные исходные тексты\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Недостаточно места в %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Загрузка исходных текстов %s\n"
-#: 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 ""
"Распаковка исходных текстов пропущена, так как в %s уже находятся "
"распакованные исходные тексты\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Команда распаковки '%s' завершилась неудачно.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Команда сборки '%s' завершилась неудачно.\n"
-#: 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 "Невозможно получить информацию о зависимостях для сборки %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s не имеет зависимостей для сборки.\n"
-#: 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 "
@@ -1179,7 +1191,7 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
"найден"
-#: 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 "
@@ -1188,32 +1200,32 @@ msgstr ""
"Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
"версий пакета %s не удовлетворяет требованиям"
-#: 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 ""
"Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
"пакет %s новее, чем надо"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Зависимости для сборки %s не могут быть удовлетворены."
-#: 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"
@@ -1465,11 +1477,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 +1534,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"
@@ -1683,9 +1696,8 @@ 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"
@@ -1828,7 +1840,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 "Проблема при хэшировании файла"
@@ -1916,121 +1928,124 @@ msgstr "Невозможно соединиться с %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
msgstr ""
+"E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
+"работы."
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
+"Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
+"ключа?!"
#: methods/gpgv.cc:196
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"
+msgstr "Не удалось выполнить "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr "для проверки подписи (gnupg установлена?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Неизвестная ошибка при выполнении gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "Будут установлены следующие дополнительные пакеты:"
+msgstr "Следующие подписи неверные:\n"
#: methods/gpgv.cc:244
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: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 "Получен заголовок длиннее %u символов"
-#: 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 "Http-сервер послал неверный заголовок"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http сервер послал неверный заголовок Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-сервер послал неверный заголовок Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
-#: 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 "Ошибка в select"
-#: 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 "Внутренняя ошибка"
@@ -2043,7 +2058,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 +2181,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"
@@ -2339,53 +2354,53 @@ msgstr "Невозможно прочесть содержимое пакета
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
-#, c-format
+#: apt-pkg/sourcelist.cc:244
+#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %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)"
@@ -2435,10 +2450,10 @@ msgstr "Каталог %spartial отсутствует."
msgid "Archive directory %spartial is missing."
msgstr "Архивный каталог %spartial отсутствует."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Загружается файл %li из %li (%s осталось)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2451,18 +2466,16 @@ msgid "Method %s did not start correctly"
msgstr "Метод %s запустился не корректно"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Менеджер пакетов '%s' не поддерживается"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Невозможно определить подходящий тип менеджера пакетов"
@@ -2580,11 +2593,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5Sum не совпадает"
-#: 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 "
@@ -2593,7 +2606,7 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет (возможно, пропущен arch)"
-#: 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 "
@@ -2602,13 +2615,13 @@ msgstr ""
"Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
"придётся вручную исправить этот пакет."
-#: 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 "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Не совпадает размер"
@@ -2713,57 +2726,57 @@ 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 ""
+msgstr "Подготавливается для удаления вместе с настройками %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Удалён вместе с настройками %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/sk.po b/po/sk.po
index 9348ea0e7..3b2fc47cf 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2006-01-07 13:39+0100\n"
"Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
"MIME-Version: 1.0\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 pre %s %s skompilovaný na %s %s\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"
@@ -509,12 +521,12 @@ msgstr "%s sa nedá vyhodnotiť"
msgid "Archive had no package field"
msgstr "Archív neobsahuje pole package"
-#: 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 " %s nemá žiadnu položku pre override\n"
-#: 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 " správcom %s je %s, nie %s\n"
@@ -614,80 +626,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: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 "Chyba pri preklade regulárneho výrazu - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Nasledovné balíky majú nesplnené závislosti:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "ale nainštalovaný je %s"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, 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:336
msgid "but it is not installable"
msgstr "ale sa nedá nainštalovať"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "ale je to virtuálny balík"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "ale nie je nainštalovaný"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "ale sa nebude inštalovať"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " alebo"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
msgid "The following packages will be REMOVED:"
msgstr "Nasledovné balíky sa ODSTRÁNIA:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
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:444
msgid "The following packages will be upgraded:"
msgstr "Nasledovné balíky sa aktualizujú:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Nasledovné balíky sa DEGRADUJÚ:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (kvôli %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: 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!"
@@ -695,176 +706,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:577
#, 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:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu reinštalovaných, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu degradovaných, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Opravujú sa závislosti..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " zlyhalo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Závislosti sa nedajú opraviť"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Sada pre aktualizáciu sa nedá minimalizovať"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Hotovo"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nesplnené závislosti. Skúste použiť -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
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:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Upozornenie o vierohodnosti bolo potlačené.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "Nedá sa načítať zoznam zdrojov."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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:832
#, 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:846 cmdline/apt-get.cc:1980
+#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
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:868
+#, 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:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Prerušené."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Zlyhalo stiahnutie %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -872,47 +884,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Chýbajúce balíky sa nedajú opraviť."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Inštalácia sa prerušuje."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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:1058
#, 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:1069
#, 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:1081
msgid " [Installed]"
msgstr "[Inštalovaný]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -922,49 +934,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:1110
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:1113
#, 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:1133
#, 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:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Adresár zoznamov sa nedá zamknúť"
-#: 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."
@@ -972,25 +984,25 @@ 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:1403
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:1502 cmdline/apt-get.cc:1538
#, 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:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -998,7 +1010,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: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"
@@ -1010,7 +1022,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: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"
@@ -1020,124 +1032,128 @@ 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
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Poškodené balíky"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
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:1683
msgid "Suggested packages:"
msgstr "Navrhované balíky:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Odporúčané balíky:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
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:1707 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Chyba"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Hotovo"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
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:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Stiahnuť zdroj %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Zlyhalo stiahnutie niektorých archívov."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, 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:2068
#, 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:2069
#, 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:2086
#, 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:2105
msgid "Child process failed"
msgstr "Proces potomka zlyhal"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, 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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1146,31 +1162,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
msgid "Failed to process build dependencies"
msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Podporované moduly:"
-#: 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"
@@ -1419,11 +1435,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 +1492,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ť"
@@ -1566,7 +1583,6 @@ 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ť"
@@ -1639,13 +1655,12 @@ 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/gzip.cc:142
@@ -1780,7 +1795,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problém s hashovaním súboru"
@@ -1867,40 +1882,42 @@ msgstr "Nedá sa pripojiť k %s %s:"
#: methods/gpgv.cc:92
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
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
msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Bola zistená aspoň jedna nesprávna signatúra."
#. FIXME String concatenation considered harmful.
#: methods/gpgv.cc:201
-#, fuzzy
msgid "Could not execute "
-msgstr "Zámok %s sa nedá získať"
+msgstr "Nedá sa spustiť "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " na kontrolu signatúry (je nainštalované gnupg?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznáma chyba pri spustení gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
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
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 +1929,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:381
msgid "Waiting for headers"
msgstr "Čaká sa na hlavičky"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Chybná hlavička"
-#: 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 "Http server poslal neplatnú hlavičku odpovede"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http server poslal neplatnú hlavičku Content-Length"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http server poslal neplatnú hlavičku Content-Range"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Tento HTTP server má poškodenú podporu rozsahov"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Neznámy formát dátumu"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Výber zlyhal"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Uplynul čas spojenia"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Chyba zápisu do výstupného súboru"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Chyba zápisu do súboru"
-#: methods/http.cc:836
+#: methods/http.cc:879
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:881
msgid "Error reading from server"
msgstr "Chyba pri čítaní zo servera"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Zlé dátové záhlavie"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Spojenie zlyhalo"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Vnútorná chyba"
@@ -1994,7 +2011,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 +2133,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"
@@ -2283,52 +2300,52 @@ msgstr "Súbor %s sa nedá spracovať (1)"
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)"
@@ -2365,7 +2382,7 @@ msgstr ""
#: apt-pkg/algorithms.cc:1061
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 +2394,10 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Sťahuje sa %li.súbor z %li (zostáva %s)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2393,19 +2410,16 @@ msgid "Method %s did not start correctly"
msgstr "Spôsob %s nebol správne spustený"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Nedá sa určiť vhodný typ balíčkovacieho systému"
@@ -2444,39 +2458,39 @@ 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2493,14 +2507,14 @@ msgstr ""
"Fíha, prekročili ste počet závislostí, ktoré toto APT zvládne spracovať."
#: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, 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
+#, 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
#, c-format
@@ -2525,11 +2539,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Nezhoda MD5 súčtov"
-#: 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 "
@@ -2538,7 +2552,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:778
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2547,13 +2561,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:814
#, 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:901
msgid "Size mismatch"
msgstr "Veľkosti sa nezhodujú"
@@ -2658,54 +2672,54 @@ 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 ""
+msgstr "Pripravuje sa odstránenie balíka %s aj s konfiguráciou"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Odstránený balík %s aj s konfiguráciou"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/sl.po b/po/sl.po
index 91fd99505..77aa60ec2 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-01-04 18:51+0100\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"
@@ -145,7 +145,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 za %s %s preveden na %s %s\n"
@@ -224,6 +224,22 @@ msgstr ""
" -o=? Nastavi poljubno nastavitveno monost, 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"
@@ -507,12 +523,12 @@ msgstr "Napaka pri postavitvi %s"
msgid "Archive had no package field"
msgstr "Arhiv ni imel polja s paketom"
-#: 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 " %s nima prekrivnega vnosa\n"
-#: 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 " Vzdrevalec %s je %s in ne %s\n"
@@ -612,79 +628,79 @@ msgstr "Napaka pri odvezovanju %s"
msgid "Failed to rename %s to %s"
msgstr "Ni mogoe preimenovati %s v %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 "Napaka pri prevajanju regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Naslednji paketi imajo nereene odvisnosti:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "vendar je paket %s nameen"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "vendar bo paket %s nameen"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "vendar se ga ne da namestiti"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "vendar je navidezen paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "vendar ni nameen"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not going to be installed"
msgstr "vendar ne bo nameen"
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
msgid " or"
msgstr " ali"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Naslednji NOVI paketi bodo nameeni:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Naslednji novi paketi bodo ODSTRANJENI:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Naslednji paketi so bili zadrani:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Naslednji paketi bodo nadgrajeni:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Naslednji paketi bodo POSTARANI:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Naslednji zadrani paketi bodo spremenjeni:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (zaradi %s) "
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -693,144 +709,144 @@ msgstr ""
"OPOZORILO: Naslednji kljuni paketi bodo odstranjeni.\n"
"To NI priporoljivo, razen e natanno veste, kaj ponete."
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu nadgrajenih, %lu na novo nameenih, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu posodobljenih, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu postaranih, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu ne popolnoma nameenih ali odstranjenih.\n"
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
msgid "Correcting dependencies..."
msgstr "Popravljanje odvisnosti ..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " spodletelo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Ni mogoe popraviti odvisnosti"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Ni mogoe pomanjati zbirke za nadgradnjo"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Opravljeno"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
msgid "Unmet dependencies. Try using -f."
msgstr "Nereene odvisnosti. Poskusite uporabiti -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "POZORO: Naslednjih paketov ni bilo mogoe avtenticirati!"
-#: 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 "Namestim te pakete brez prevejanje [y/N]? "
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
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:711 cmdline/apt-get.cc:858
msgid "There are problems and -y was used without --force-yes"
msgstr "Prilo je do teav in -y je bil uporabljen brez --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 "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
#, 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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
msgid "Unable to lock the download directory"
msgstr "Ni mogoe zakleniti imenika za prenose"
-#: 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 "Seznama virov ni mogoe brati."
-#: 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 "Potrebno je dobiti %sB/%sB arhivov.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, 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:829
#, 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:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\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 "Nimate dovolj prostora na %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, 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:864 cmdline/apt-get.cc:884
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Izbrana je monost Samo preprosto, a to opravilo ni preprosto."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Da, naredi tako kot pravim!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -841,28 +857,28 @@ msgstr ""
"Za nadaljevanje vnesite frazo '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Prekini."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Ni mogoe dobiti %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
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:980 cmdline/apt-get.cc:2032
msgid "Download complete and in download only mode"
msgstr "Prenos dokonan in uporabljen nain samo prenos"
-#: 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?"
@@ -870,47 +886,47 @@ msgstr ""
"Nekaterih arhivov ni mogoe dobiti. Poskusite uporabiti apt-get update ali --"
"fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
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:995
msgid "Unable to correct missing packages."
msgstr "Ni mogoe popraviti manjkajoih paketov."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Prekinjanje namestitve."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "%s preskoen, ker je e nameen in ne potrebuje nadgradnje.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Paket %s ni nameen, zato ni odstranjen\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Nameeno]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
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:1091
#, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -921,49 +937,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:1110
msgid "However the following packages replace it:"
msgstr "Kakorkoli, naslednji paketi ga nadomestijo:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, 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:1133
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Ponovna namestitev %s ni mona, ker ni moen prenos.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Najnoveja razliica %s je e nameena.\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Izdaje '%s' za '%s' ni mogoe najti"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Razliice '%s' za '%s' ni mogoe najti"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Izbrana razliica %s (%s) za %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Imenika seznamov ni mogoe zakleniti"
-#: 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."
@@ -971,25 +987,25 @@ msgstr ""
"Nekaterih kazal ni mogoe prenesti, zato so preklicana, ali pa so "
"uporabljena stareja."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Ni mogoe najti paketa %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -997,7 +1013,7 @@ msgstr ""
"Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
"podajte reitev)."
-#: 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"
@@ -1008,7 +1024,7 @@ msgstr ""
"nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
"paketi e niso ustvarjeni ali preneeni iz Prihajajoe."
-#: 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"
@@ -1018,125 +1034,130 @@ msgstr ""
"preprosto ne da namestiti in je potrebno vloiti poroilo o hrou\n"
"o tem paketu."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Pokvarjeni paketi"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Naslednji dodatni paketi bodo nameeni:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Predlagani paketi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Priporoeni paketi:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Preraunavanje nadgradnje ... "
-#: 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 "Spodletelo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Opravljeno"
-#: 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 "Notranja napaka zaradi AllUpgrade."
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
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:1915 cmdline/apt-get.cc:2144
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Izvornega paketa za %s ni mogoe najti"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Dobi vir %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Nekaterih arhivov ni mogoe dobiti."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
-#: 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 "Ukaz gradnje '%s' ni uspel.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Otroki proces ni uspel"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s"
-#: 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 "
@@ -1145,31 +1166,31 @@ msgstr ""
"%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne "
"more zadostiti zahtevi po razliici"
-#: 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 ""
"Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Obdelava odvisnosti za gradnjo ni uspela"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Podprti moduli:"
-#: 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"
@@ -1424,7 +1445,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 +1498,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 mogoe brati %s"
@@ -1779,7 +1801,7 @@ msgstr "Povezava podatkovne vtinice potekla"
msgid "Unable to accept connection"
msgstr "Ni mogoe sprejeti povezave"
-#: 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 "Teava pri razprevanju datoteke"
@@ -1911,76 +1933,76 @@ msgstr "Ni mogoe odprti %s"
msgid "Read error from %s process"
msgstr "Napaka pri branju iz procesa %s"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "akanje na glave"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Napana vrstica glave"
-#: 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 "Strenik HTTP je poslal napano glavo odgovora"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Strenik HTTP je poslal glavo z napano dolino vsebine"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Strenik HTTP je poslal glavo z napanim obsegom vsebine"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Ta strenik HTTP ima pokvarjen obseg podpore"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Neznana oblika datuma"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "Izbira ni uspela"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "as za povezavo se je iztekel"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Napaka pri pisanju v izhodno datoteko"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Napaka pri pisanju v datoteko"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika "
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Napaka pri branju s strenika"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Napani podatki glave"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Povezava ni uspela"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Notranja napaka"
@@ -1993,7 +2015,7 @@ msgstr "mmap prazne datoteke ni mogo"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Ni mogoe 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 mogoe najti"
@@ -2115,7 +2137,7 @@ msgstr "Napana operacija %s"
msgid "Unable to stat the mount point %s"
msgstr "Ni mogoe doloiti priklopne toke %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 mogoe spremeniti v %s"
@@ -2282,52 +2304,52 @@ msgstr "Ni mogoe razleniti paketne datoteke %s (1)"
msgid "Unable to parse package file %s (2)"
msgstr "Ni mogoe razleniti 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 "Napana 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 "Napana 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 "Napana vrstica %lu v seznamu virov %s (razlenitev URI)"
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Napana 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 "Napana vrstica %lu v seznamu virov %s (razlenitev 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 "Napana 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 "Napana vrstica %u v seznamu virov %s (ID ponudnika)"
@@ -2377,7 +2399,7 @@ msgstr "Manjka imenik s seznami %spartial."
msgid "Archive directory %spartial is missing."
msgstr "Manjka imenik z arhivi %spartial."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2400,12 +2422,12 @@ msgstr ""
" '%s'\n"
"v enoto '%s' in pritisnite enter\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketni sistem '%s' ni podprt"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni mogoe ugotoviti ustrezne vrste paketnega sistema"
@@ -2523,11 +2545,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Neujemanje vsote MD5"
-#: 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 "
@@ -2536,7 +2558,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket (zaradi manjkajoega arhiva)."
-#: 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 "
@@ -2545,7 +2567,7 @@ msgstr ""
"Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono "
"popraviti ta paket."
-#: 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."
@@ -2553,7 +2575,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:901
msgid "Size mismatch"
msgstr "Neujemanje velikosti"
diff --git a/po/sv.po b/po/sv.po
index 172761955..ee87218aa 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2006-01-08 03:25+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <sv@li.org>\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
@@ -150,7 +149,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 fr %s %s kompilerad den %s %s\n"
@@ -229,6 +228,18 @@ msgstr ""
" -o=? Ange valfri instllningsflagga. T.ex -o dir::cache=/tmp\n"
"Se manualsidorna fr apt-cache(8) och apt.conf(5) fr 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 fr denna skiva, ssom \"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 fr resten av CD-skivorna i din uppsttning."
+
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
msgstr "Flaggorna gavs inte parvis"
@@ -515,13 +526,13 @@ msgstr "Misslyckades att ta status p %s"
msgid "Archive had no package field"
msgstr "Arkivet har inget package-flt"
-#: 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 " %s har ingen post i override-filen\n"
# parametrar: paket, ny, gammal
-#: 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 " ansvarig fr %s r %s ej %s\n"
@@ -623,79 +634,79 @@ msgstr "Problem med att lnka 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:120
msgid "Y"
msgstr "J"
-#: 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 "Fel vid tolkning av reguljrt uttryck - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
msgid "The following packages have unmet dependencies:"
msgstr "Fljande paket har beroenden som inte kan tillfredsstllas:"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
#, c-format
msgid "but %s is installed"
msgstr "men %s r installerat"
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
#, c-format
msgid "but %s is to be installed"
msgstr "men %s skall installeras"
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
msgid "but it is not installable"
msgstr "men det kan inte installeras"
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
msgid "but it is a virtual package"
msgstr "men det r ett virtuellt paket"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
msgid "but it is not installed"
msgstr "men det r inte installerat"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:346
msgid " or"
msgstr " eller"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
msgstr "Fljande NYA paket kommer att installeras:"
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
msgid "The following packages will be REMOVED:"
msgstr "Fljande paket kommer att TAS BORT:"
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
msgstr "Fljande paket har hllits tillbaka:"
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
msgstr "Fljande paket kommer att uppgraderas:"
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
msgid "The following packages will be DOWNGRADED:"
msgstr "Fljande paket kommer att NEDGRADERAS:"
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
msgid "The following held packages will be changed:"
msgstr "Fljande hllna paket kommer att ndras:"
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (p grund av %s) "
-#: cmdline/apt-get.cc:544
+#: 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!"
@@ -703,143 +714,145 @@ msgstr ""
"VARNING: Fljande systemkritiska paket kommer att tas bort\n"
"Detta br INTE gras svida du inte vet exakt vad du gr!"
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu uppgraderade, %lu nyinstallerade, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu ominstallerade, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nedgraderade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Rttar beroenden...."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
msgstr " misslyckades."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Kunde inte rtta beroenden"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Kunde inte minimera uppgraderingsuppsttningen"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Frdig"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
msgid "You might want to run `apt-get -f install' to correct these."
msgstr "Du kan mjligen rtta dessa genom att kra \"apt-get -f install\"."
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
msgid "Unmet dependencies. Try using -f."
msgstr "Otillfredsstllda beroenden. Frsk med -f."
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "VARNING: Fljande paket kunde inte autentiseras!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
msgstr "Authentiseringsvarning verkrd.\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
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:702
msgid "Some packages could not be authenticated"
msgstr "Ngra av paketen kunde inte autentiseras"
-#: 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 "Problem har uppsttt och -y anvndes utan --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
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:764
msgid "Packages need to be removed but remove is disabled."
msgstr "Paket mste tas bort men \"Remove\" r inaktiverat."
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
msgid "Internal error, Ordering didn't finish"
msgstr "Internt fel. Sorteringen frdigstlldes inte"
-#: 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 "Kunde inte lsa hmtningskatalogen."
-#: 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 "Listan ver kllor kunde inte lsas."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian.org"
+msgstr ""
+"Konstigt.. storlekarna stmde inte, skicka e-post till apt@packages.debian."
+"org"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Behver hmta %sB/%sB arkiv.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Behver hmta %sB arkiv.\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 "Efter uppackning kommer %sB ytterligare diskutrymme anvndas.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Efter uppackning kommer %sB frigras p disken.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Kunde inte lsa av ledigt utrymme i %s"
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Du har inte tillrckligt ledigt utrymme i %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 "\"Trivial Only\" angavs, men detta r inte en trivial handling."
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Ja, gr som jag sger!"
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
#, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -851,28 +864,28 @@ msgstr ""
" ?] "
# Visas d man svarar nej
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Avbryter."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Vill du fortstta [J/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 "Misslyckades att hmta %s %s\n"
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
msgid "Some files failed to download"
msgstr "Misslyckades att hmta vissa filer"
-#: 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 "Hmtningen frdig i \"endast-hmta\"-lge"
-#: 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?"
@@ -880,48 +893,48 @@ msgstr ""
"Vissa arkiv kunte inte hmtas. Prva eventuellt \"apt-get update\" eller med "
"--fix-missing."
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "--fix-missing och mediabyte stds inte nnu"
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
msgid "Unable to correct missing packages."
msgstr "Kunde inte rtta saknade paket."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Avbryter installationen."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Observera, vljer %s istllet fr %s\n"
-#: 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 ""
"Hoppar ver %s, det r redan installerat och uppgradering har inte valts.\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Paketet %s r ett virtuellt paket som tillhandahlls av:\n"
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
msgid " [Installed]"
msgstr " [Installerat]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Du br explicit ange ett att installera."
-#: 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"
@@ -932,49 +945,49 @@ msgstr ""
"Detta betyder vanligen att paketet saknas, har blivit frldrat eller\n"
"bara r tillgngligt frn andra kllor\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
msgid "However the following packages replace it:"
msgstr "Dock kan fljande paket erstta det:"
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Paketet %s har ingen installationskandidat"
-#: 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 "Ominstallation av %s r inte mjlig, det kan inte hmtas.\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Utgvan \"%s\" fr \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Version \"%s\" fr \"%s\" hittades inte"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Vald version %s (%s) fr %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Kunde inte lsa listkatalogen"
-#: 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."
@@ -982,25 +995,25 @@ msgstr ""
"Vissa indexfiler kunde inte hmtas, de har ignorerats eller s har de gamla "
"anvnts istllet."
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internt fel, AllUpgrade frstrde ngot"
-#: 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 "Kunde inte hitta paketet %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Observera, vljer %s fr regex \"%s\"\n"
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1555
msgid "You might want to run `apt-get -f install' to correct these:"
msgstr "Du kan mjligen rtta detta genom att kra \"apt-get -f install\":"
-#: 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)."
@@ -1008,7 +1021,7 @@ msgstr ""
"Otillfredsstllda beroenden. Frsk med \"apt-get -f install\" utan paket "
"(eller ange en lsning)."
-#: 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"
@@ -1020,7 +1033,7 @@ msgstr ""
"distributionen, att ngra krvda paket nnu inte har skapats eller\n"
"lagts in frn \"Incoming\"."
-#: 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"
@@ -1030,114 +1043,119 @@ msgstr ""
"helt enkelt inte kan installeras och att en felrapport om detta br\n"
"skrivas."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
msgstr "Fljande information kan vara till hjlp fr att lsa situationen:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
msgstr "Trasiga paket"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Fljande ytterligare paket kommer att installeras:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Freslagna paket:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Rekommenderade paket:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Berknar uppgradering... "
-#: 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 "Misslyckades"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Frdig"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
msgstr "Internt fel, problemlsaren brt snder saker"
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1885
msgid "Must specify at least one package to fetch source for"
msgstr "Du mste ange tminstone ett paket att hmta kllkod fr"
-#: 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 "Kunde inte hitta ngot kllkodspaket fr %s"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Hoppar ver redan nedladdad fil \"%s\"\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Du har inte tillrckligt ledigt utrymme i %s"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Behver hmta %sB/%sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Behver hmta %sB kllkodsarkiv.\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Hmtar kllkod %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
msgid "Failed to fetch some archives."
msgstr "Misslyckades att hmta vissa arkiv."
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2056
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Packar inte upp redan redan uppackad kllkod i %s\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr "Kontrollera om paketet 'dpkg-dev' r installerat.\n"
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Byggkommandot \"%s\" misslyckades.\n"
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2105
msgid "Child process failed"
msgstr "Barnprocessen misslyckades"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
msgid "Must specify at least one package to check builddeps for"
msgstr "Du mste ange tminstone ett paket att inhmta byggberoenden fr"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Kunde inte hmta byggberoendeinformation fr %s"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s har inga byggberoenden.\n"
-#: 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 "
@@ -1145,7 +1163,7 @@ msgid ""
msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom paketet %s inte hittas"
-#: 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 "
@@ -1154,32 +1172,32 @@ msgstr ""
"%s-beroendet p %s kan inte tillfredsstllas eftersom inga tillgngliga "
"versioner av paketet %s uppfyller versionskraven"
-#: 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 ""
"Misslyckades att uppfylla %s-beroendet fr %s: Det installerade paketet %s "
"r fr nytt"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Misslyckades att uppfylla %s-beroendet fr %s: %s"
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Byggberoenden fr %s kunde inte uppfyllas."
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2351
msgid "Failed to process build dependencies"
msgstr "Kunde inte hantera byggberoenden"
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2383
msgid "Supported modules:"
msgstr "Moduler som stds:"
-#: 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"
@@ -1439,7 +1457,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 stnga filen %s"
@@ -1493,7 +1511,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 lsa %s"
@@ -1796,7 +1815,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgrns"
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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem med att lgga filen till hashtabellen"
@@ -1920,7 +1939,8 @@ msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte r tillgnglig:\n"
+"Fljande signaturer kunde inte verifieras fr att den publika nyckeln inte "
+"r tillgnglig:\n"
#: methods/gzip.cc:57
#, c-format
@@ -1933,76 +1953,76 @@ msgstr "Kunde inte ppna rr fr %s"
msgid "Read error from %s process"
msgstr "Lsfel p %s-processen"
-#: methods/http.cc:344
+#: methods/http.cc:381
msgid "Waiting for headers"
msgstr "Vntar p huvuden"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, 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:535
msgid "Bad header line"
msgstr "Trasig huvudrad"
-#: 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 "Http-servern snde ett ogiltigt svarshuvud"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Http-servern snde ett ogiltigt Content-Length-huvud"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Http-servern snde ett ogiltigt Content-Range-huvud"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "Denna http-servers std fr delvis hmtning fungerar inte"
-#: methods/http.cc:594
+#: methods/http.cc:631
msgid "Unknown date format"
msgstr "Oknt datumformat"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
msgstr "\"Select\" misslyckades"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Tidsgrnsen fr anslutningen nddes"
-#: methods/http.cc:769
+#: methods/http.cc:806
msgid "Error writing to output file"
msgstr "Fel vid skrivning till utdatafil"
-#: methods/http.cc:797
+#: methods/http.cc:837
msgid "Error writing to file"
msgstr "Fel vid skrivning till fil"
-#: methods/http.cc:822
+#: methods/http.cc:865
msgid "Error writing to the file"
msgstr "Fel vid skrivning till filen"
-#: methods/http.cc:836
+#: methods/http.cc:879
msgid "Error reading from server. Remote end closed connection"
msgstr "Fel vid lsning frn server: Andra nden stngde frbindelsen"
-#: methods/http.cc:838
+#: methods/http.cc:881
msgid "Error reading from server"
msgstr "Fel vid lsning frn server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Trasigt data i huvud"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
msgstr "Anslutning misslyckades"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
msgid "Internal error"
msgstr "Internt fel"
@@ -2015,7 +2035,7 @@ msgstr "Kan inte utfra mmap p en tom fil"
msgid "Couldn't make mmap of %lu bytes"
msgstr "Kunde inte utfra 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 +2157,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Kunde inte ta status p monteringspunkt %s."
# Felmeddelande fr 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"
@@ -2307,52 +2327,52 @@ msgstr "Kunde inte tolka paketfilen %s (1)"
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 kllistan %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 kllistan %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 kllistan %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 kllistan %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 kllistan %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 fr lng i kllistan %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 kllistan %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 oknd p rad %u i kllistan %s"
+msgstr "Typ \"%s\" r oknd p rad %u i listan ver kllor %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 kllistan %s har fel format (leverantrs-id)"
@@ -2403,7 +2423,7 @@ msgstr "Listkatalogen %spartial saknas."
msgid "Archive directory %spartial is missing."
msgstr "Arkivkatalogen %spartial saknas."
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr "Laddar ner fil %li av %li (%s terstr)"
@@ -2423,13 +2443,13 @@ msgstr "Metoden %s startade inte korrekt"
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."
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Paketsystemet \"%s\" stds inte"
-#
-#: apt-pkg/init.cc:135
+#
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Kunde inte avgra en lmpligt paketsystemstyp"
@@ -2550,11 +2570,11 @@ msgstr "In-/utfel vid lagring av kllcache"
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:911
msgid "MD5Sum mismatch"
msgstr "MD5-kontrollsumma stmmer inte"
-#: 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 "
@@ -2563,7 +2583,7 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket (p grund av saknad arkitektur)."
-#: 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 "
@@ -2572,13 +2592,13 @@ msgstr ""
"Jag kunde inte lokalisera ngon fil fr paketet %s. Detta kan betyda att du "
"manuellt mste reparera detta paket."
-#: 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 "Paketindexfilerna r trasiga. Inget \"Filename:\"-flt fr paketet %s."
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "Storleken stmmer inte"
@@ -2743,7 +2763,8 @@ msgstr "Frbindelsen stngdes i frtid"
#~ "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..a7d843979 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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-12-22 01:10+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)"
@@ -152,7 +152,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 para sa %s %s kinompile noong %s %s\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
#, 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,46 +417,46 @@ 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
#, 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
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Luma ang DB, sinusubukang i-apgreyd %s"
+msgstr "Luma ang DB, sinusubukang maupgrade %s"
#: ftparchive/cachedb.cc:73
#, 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
#, c-format
msgid "File date has changed %s"
-msgstr "Nagbago ang petsa ng tipunan %s"
+msgstr "Nagbago ang petsa ng talaksan %s"
#: ftparchive/cachedb.cc:155
msgid "Archive has no control record"
-msgstr "Walang control record ang arkibo"
+msgstr "Walang kontrol rekord ang arkibo"
#: ftparchive/cachedb.cc:267
msgid "Unable to get a cursor"
@@ -468,21 +482,21 @@ msgstr "W: "
#: ftparchive/writer.cc:134
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
#, c-format
msgid "Failed to resolve %s"
-msgstr "Sawi sa pag-resolba %s"
+msgstr "Bigo sa pag-resolba ng %s"
#: ftparchive/writer.cc:163
msgid "Tree walking failed"
-msgstr "Sawi ang paglakad sa puno"
+msgstr "Bigo ang paglakad sa puno"
#: ftparchive/writer.cc:188
#, c-format
msgid "Failed to open %s"
-msgstr "Sawi ang pagbukas ng %s"
+msgstr "Bigo ang pagbukas ng %s"
#: ftparchive/writer.cc:245
#, c-format
@@ -492,17 +506,17 @@ msgstr " DeLink %s [%s]\n"
#: ftparchive/writer.cc:253
#, 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
#, 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
#, 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
#, c-format
@@ -513,18 +527,18 @@ msgstr " DeLink limit na %sB tinamaan.\n"
#: 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"
+msgstr "Bigo ang pag-stat ng %s"
#: ftparchive/writer.cc:386
msgid "Archive had no package field"
msgstr "Walang field ng pakete ang arkibo"
-#: 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 " %s ay walang override entry\n"
-#: 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 " Maintainer ng %s ay %s hindi %s\n"
@@ -536,7 +550,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 +575,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 +589,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 +606,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 +622,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 +636,232 @@ 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:120
msgid "Y"
msgstr "O"
-#: 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 "Error sa pag-compile ng regex - %s"
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
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:327
#, 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:329
#, 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:336
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:338
msgid "but it is a virtual package"
msgstr "ngunit ito ay birtwal na pakete"
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
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:341
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:346
msgid " or"
msgstr " o"
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
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:401
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:423
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:444
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:465
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:485
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:538
#, c-format
msgid "%s (due to %s) "
msgstr "%s (dahil sa %s) "
-#: cmdline/apt-get.cc:544
-#, fuzzy
+#: 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 ""
-"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:577
#, c-format
msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu nai-upgrade, %lu bagong instol, "
+msgstr "%lu nai-upgrade, %lu bagong luklok, "
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
#, c-format
msgid "%lu reinstalled, "
-msgstr "%lu ininstol muli, "
+msgstr "%lu iniluklok muli, "
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
#, c-format
msgid "%lu downgraded, "
msgstr "%lu nai-downgrade, "
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
#, 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:589
#, 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:649
msgid "Correcting dependencies..."
msgstr "Inaayos ang mga dependensiya..."
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
msgid " failed."
-msgstr " ay sawi."
+msgstr " ay bigo."
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
msgid "Unable to correct dependencies"
msgstr "Hindi maayos ang mga dependensiya"
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
msgstr "Hindi mai-minimize ang upgrade set"
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
msgid " Done"
msgstr " Tapos"
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
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:667
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:689
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:693
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:700
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:702
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:711 cmdline/apt-get.cc:858
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:755
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:764
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:775
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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
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: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 "Hindi mabasa ang talaan ng pagkukunan (sources)."
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816
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:821
#, 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:824
#, 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:829
#, 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 ay magagamit.\n"
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
#, 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 %sB na puwang sa disk ay mapapalaya.\n"
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#, 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:849
#, 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:864 cmdline/apt-get.cc:884
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:866
msgid "Yes, do as I say!"
msgstr "Oo, gawin ang sinasabi ko!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: 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"
@@ -855,28 +871,28 @@ msgstr ""
"Upang magpatuloy, ibigay ang pariralang '%s'\n"
" ?] "
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
msgstr "Abort."
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
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:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
#, 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:979
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:980 cmdline/apt-get.cc:2032
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:986
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -884,48 +900,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:990
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:995
msgid "Unable to correct missing packages."
msgstr "Hindi maayos ang mga kulang na pakete."
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
msgid "Aborting install."
msgstr "Ina-abort ang pag-instol."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
#, 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:1040
#, 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"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, 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"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, 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:1081
msgid " [Installed]"
msgstr " [Naka-instol]"
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
msgid "You should explicitly select one to install."
msgstr "Dapat ninyong piliin ang isa na instolahin."
-#: 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"
@@ -936,76 +952,76 @@ msgstr ""
"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n"
"sa ibang pinagmulan.\n"
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
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:1113
#, 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:1133
#, 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"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, 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:1168
#, 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:1170
#, 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:1176
#, 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:1313
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:1326 cmdline/apt-get.cc:1420
msgid "Unable to lock the list directory"
msgstr "Hindi maaldaba ang directory ng talaan"
-#: 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 ""
-"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:1403
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:1502 cmdline/apt-get.cc:1538
#, c-format
msgid "Couldn't find package %s"
msgstr "Hindi mahanap ang paketeng %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1013,7 +1029,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: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"
@@ -1024,7 +1040,7 @@ 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: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"
@@ -1034,116 +1050,120 @@ msgstr ""
"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
"pakete na ito."
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
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:1586
msgid "Broken packages"
msgstr "Sirang mga pakete"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1683
msgid "Suggested packages:"
msgstr "Mga paketeng mungkahi:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "Mga paketeng rekomendado:"
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1704
msgid "Calculating upgrade... "
msgstr "Kinakalkula ang upgrade... "
-#: 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 "Sawi"
+msgstr "Bigo"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1712
msgid "Done"
msgstr "Tapos"
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
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:1885
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:1915 cmdline/apt-get.cc:2144
#, 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:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n"
+
+#: cmdline/apt-get.cc:1983
#, 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:1988
#, 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:1991
#, 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:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "Kunin ang Source %s\n"
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2028
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:2056
#, 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:2068
#, 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:2069
#, 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:2086
#, 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:2105
msgid "Child process failed"
-msgstr "Sawi ang prosesong anak"
+msgstr "Bigo ang prosesong anak"
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2121
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:2149
#, 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:2169
#, 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:2221
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1172,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:2273
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,32 +1181,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:2308
#, 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:2333
#, 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:2347
#, 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:2351
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:2383
msgid "Supported modules:"
msgstr "Suportadong mga Module:"
-#: 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"
@@ -1244,8 +1264,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 +1275,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"
@@ -1320,16 +1340,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
@@ -1367,11 +1387,11 @@ 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
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
msgid "Corrupted archive"
@@ -1379,16 +1399,16 @@ msgstr "Sirang arkibo"
#: apt-inst/contrib/extracttar.cc:195
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
#, 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 +1416,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 +1424,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 +1432,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 +1455,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 +1498,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 +1512,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 +1529,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,7 +1539,7 @@ 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"
@@ -1534,7 +1555,7 @@ 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
@@ -1543,7 +1564,7 @@ msgstr "Internal error sa pagkuha ng pangalan ng pakete"
#: apt-inst/deb/dpkgdb.cc:205
msgid "Reading file listing"
-msgstr "Binabasa ang Tipunang Listahan"
+msgstr "Binabasa ang Talaksang Listahan"
#: apt-inst/deb/dpkgdb.cc:216
#, c-format
@@ -1552,14 +1573,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 +1589,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"
@@ -1590,17 +1611,17 @@ 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"
+msgstr "Binabasa ang Talaksang 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 +1650,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 +1679,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/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
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 +1720,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 +1738,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 +1809,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 +1819,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:963 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,7 +1835,7 @@ 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
@@ -1871,7 +1891,7 @@ msgstr "Hindi maresolba ang '%s'"
#: methods/connect.cc:171
#, 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
#, c-format
@@ -1886,40 +1906,44 @@ msgstr "Hindi maka-konek sa %s %s:"
#: methods/gpgv.cc:92
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
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
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"
+msgstr "Hindi ma-execute ang "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Hindi kilalang error sa pag-execute ng gpgv"
#: methods/gpgv.cc:237
-#, fuzzy
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
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 +1955,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:381
msgid "Waiting for headers"
msgstr "Naghihintay ng mga header"
-#: methods/http.cc:490
+#: methods/http.cc:527
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter"
-#: methods/http.cc:498
+#: methods/http.cc:535
msgid "Bad header line"
msgstr "Maling linyang header"
-#: 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 "Nagpadala ang HTTP server ng di tanggap na reply header"
-#: methods/http.cc:553
+#: methods/http.cc:590
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:605
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:607
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:631
msgid "Unknown date format"
msgstr "Di kilalang anyo ng petsa"
-#: methods/http.cc:741
+#: methods/http.cc:778
msgid "Select failed"
-msgstr "Sawi ang pagpili"
+msgstr "Bigo ang pagpili"
-#: methods/http.cc:746
+#: methods/http.cc:783
msgid "Connection timed out"
msgstr "Nag-timeout ang koneksyon"
-#: methods/http.cc:769
+#: methods/http.cc:806
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:837
msgid "Error writing to file"
-msgstr "Error sa pagsulat sa tipunan"
+msgstr "Error sa pagsulat sa talaksan"
-#: methods/http.cc:822
+#: methods/http.cc:865
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:879
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:881
msgid "Error reading from server"
msgstr "Error sa pagbasa mula sa server"
-#: methods/http.cc:1069
+#: methods/http.cc:1112
msgid "Bad header data"
msgstr "Maling datos sa header"
-#: methods/http.cc:1086
+#: methods/http.cc:1129
msgid "Connection failed"
-msgstr "Sawi ang koneksyon"
+msgstr "Bigo ang koneksyon"
-#: methods/http.cc:1177
+#: methods/http.cc:1220
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 +2050,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 +2096,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
@@ -2137,31 +2161,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 +2216,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 +2230,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 +2246,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
@@ -2299,62 +2324,62 @@ msgstr "Pagbuo ng Dependensiya"
#: apt-pkg/tagfile.cc:73
#, 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
#, 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,7 +2396,7 @@ 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
#, c-format
@@ -2404,10 +2429,10 @@ 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
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2420,19 +2445,17 @@ msgid "Method %s did not start correctly"
msgstr "Hindi umandar ng tama ang paraang %s"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
#, 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:136
msgid "Unable to determine a suitable packaging system type"
msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
@@ -2448,7 +2471,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 +2481,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
@@ -2544,7 +2567,7 @@ msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
#: apt-pkg/pkgcachegen.cc:658
msgid "Collecting File Provides"
-msgstr "Kinukuha ang Tipunang Provides"
+msgstr "Kinukuha ang Talaksang Provides"
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
msgid "IO Error saving source cache"
@@ -2553,39 +2576,39 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "Di tugmang MD5Sum"
-#: 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 ""
-"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: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 ""
-"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:814
#, 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:901
msgid "Size mismatch"
msgstr "Di tugmang laki"
@@ -2632,7 +2655,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 +2701,74 @@ 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 ""
+msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "Tinanggal ang %s kasama ang pagkasaayos nito"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Nagsara ng maaga ang koneksyon"
#~ 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..f656b2146
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,2849 @@
+# Vietnamese Translation for apt.
+# This file is put in the public domain.
+# Clytie Siddall <clytie@riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-04-30 16:05+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"
+
+#: 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
+#, fuzzy
+msgid "Total package names : "
+msgstr "Tổng tên gói:"
+
+#: cmdline/apt-cache.cc:272
+#, fuzzy
+msgid " Normal packages: "
+msgstr " Gói bình thường: "
+
+#: cmdline/apt-cache.cc:273
+#, fuzzy
+msgid " Pure virtual packages: "
+msgstr " Gói ảo nguyên chất: "
+
+#: cmdline/apt-cache.cc:274
+#, fuzzy
+msgid " Single virtual packages: "
+msgstr " Gói ảo đơn: "
+
+#: cmdline/apt-cache.cc:275
+#, fuzzy
+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
+#, fuzzy
+msgid "Total distinct versions: "
+msgstr "Tổng phiên bản riêng:"
+
+#: cmdline/apt-cache.cc:280
+#, fuzzy
+msgid "Total dependencies: "
+msgstr "Tổng cách phụ thuộc:"
+
+#: cmdline/apt-cache.cc:283
+#, fuzzy
+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
+#, fuzzy
+msgid "Total Provides mappings: "
+msgstr "Tổng cách ảnh xạ miễn là:"
+
+#: cmdline/apt-cache.cc:297
+#, fuzzy
+msgid "Total globbed strings: "
+msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm:"
+
+#: cmdline/apt-cache.cc:311
+#, fuzzy
+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
+#, fuzzy
+msgid "Total slack space: "
+msgstr "Tổng chỗ chưa dùng:"
+
+#: cmdline/apt-cache.cc:324
+#, fuzzy
+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 riêng lẻ."
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "Không tìm thấy gói nào."
+
+#: cmdline/apt-cache.cc:1462
+#, fuzzy
+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ể x-ref một tập tin gói nào đó."
+
+# 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
+#, fuzzy
+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
+#, fuzzy
+msgid " Package pin: "
+msgstr " Ghim gói: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+#, fuzzy
+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: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:2378 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:1658
+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 được 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 ấy.\n"
+"\n"
+"Lệnh:\n"
+" add\t\t_Thêm_ một gói nào đó vào bộ nhớ tạm nguồn\n"
+" gencaches\tXây dung (_tạo ra_) cả hai gói và _bộ nhớ tạm_ nguồn đều\n"
+" showpkg\t_Hiển thị_ một phần thông tin chung về một _gói_ riêng lẻ\n"
+" showsrc\t_Hiển thị_ các mục ghi _nguồn_\n"
+" stats\t\tHiển thị một phần _thống kê_ cơ bản\n"
+" dump\t\tHiển thị toàn 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 thị 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 thị_ mục ghi có thể đọc, cho gói ấy\n"
+" depends\tHiển thị thông tin cách _phụ thuộc_ thô cho gói ấy\n"
+" rdepends\tHiển thị thông tin cách _phụ thuộc ngược lại_, cho gói ấy\n"
+" pkgnames\tHiển thị 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 của _gói_ ấy.\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 thị chỉ những cách phụ thuộc _quan trọng_ cho lệnh chưa thực "
+"hiện.\n"
+" -c=? \t\tĐọc tập tin _cấu hình_ ấ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» apt-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 ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Chuyển đổi phương tiện: hãy nạp đĩa có nhãn\n"
+" '%s'\n"
+"vào ổ '%s' và bấm nút 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 "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"
+"(config: viết tắt cho từ configuration: cấu hình)\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 ấ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"
+"(extract: \t\trút;\n"
+"templates: \tnhững mẫu)\n"
+"apt-extracttemplates là một công cụ rút thông tin loại cấu hình và 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 (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 ấ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:710
+#, 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ể gói phiên bản debconf. Có cài đăt debconf 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
+#, fuzzy, 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
+#, fuzzy, 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"
+"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"
+"(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 chứa băm MD5 và 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) để ghi rõ tập tin đè "
+"nguồn\n"
+"\n"
+"Hãy chạy lệnh 'packages' (gói) và 'sources' (nguồn) tại gốc cây ấy.\n"
+"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của hành động tìm kiếm đệ "
+"quy,\n"
+"và tập tin đè nên chứa những cờ đè.\n"
+"Nếu có thì phụ thêm Pathprefix (tiền tố đường dẫn) vào những trường tên tập "
+"tin.\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 ấ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 "Chưa khớp điều đã chọn nào."
+
+#: 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:45
+#, 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:63
+#, 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:73
+#, 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:114
+#, c-format
+msgid "File date has changed %s"
+msgstr "Ngày tập tin đã đổi rồi %s."
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "Kho không có mục ghi điều khiển nào."
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "Không thể gói con chạy nào."
+
+#: ftparchive/writer.cc:78
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Không thể đọc thư mục %s.\n"
+
+#: ftparchive/writer.cc:83
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Không thể gói thông tin toàn bộ cho %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: có lỗi áp dụng vào tập tin"
+
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Không quyết định %s được."
+
+#: ftparchive/writer.cc:163
+msgid "Tree walking failed"
+msgstr "Không di chuyển qua cây được."
+
+#: ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to open %s"
+msgstr "Không mở %s được."
+
+#: ftparchive/writer.cc:245
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " Bỏ liên kết %s [%s]\n"
+
+#: ftparchive/writer.cc:253
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Không tạo liên kết lại %s được."
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Không bỏ liên kết %s được."
+
+#: ftparchive/writer.cc:264
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Không liên kết %s đến %s được."
+
+#: ftparchive/writer.cc:274
+#, 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: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 "Không gọi thông tin toàn bộ cho %s được."
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "Kho không có trường gói nào."
+
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " %s không có mục ghi đè nào.\n"
+
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#, 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/contents.cc:317
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gặp lỗi nội bộ, không thể định vị phần %s."
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - không phân chia bộ nhớ được."
+
+#: 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 "Không đọc tập tin đè %s được."
+
+#: ftparchive/multicompress.cc:75
+#, fuzzy, 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 "Không tạo ống IPC đến tiến trình con được."
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "Không tạo TẬP_TIN* được."
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "Không tạo tiến trình con được."
+
+#: ftparchive/multicompress.cc:215
+#, fuzzy
+msgid "Compress child"
+msgstr "Nén con."
+
+#: ftparchive/multicompress.cc:238
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Lỗi nội bộ, không tạo %s được."
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "Không tạo tiến trình con IPC được."
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "Không thực hiện bô nén được."
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "bộ giải nén"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "không gõ/xuất vào tiến trình con được"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "Không đọc được khi tính MD5."
+
+#: 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 "Không đổi tên %s thành %s được."
+
+#: cmdline/apt-get.cc:120
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
+#, 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:237
+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:327
+#, c-format
+msgid "but %s is installed"
+msgstr "nhưng mà đã cài đặt %s rồi."
+
+#: cmdline/apt-get.cc:329
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà sẽ cài %s."
+
+#: cmdline/apt-get.cc:336
+msgid "but it is not installable"
+msgstr "nhưng mà không thể càì nó."
+
+#: cmdline/apt-get.cc:338
+msgid "but it is a virtual package"
+msgstr "nhưng mà nó là gói ảo."
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not installed"
+msgstr "nhưng mà chưa cài nó."
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not going to be installed"
+msgstr "nhưng mà sẽ không cài nó."
+
+#: cmdline/apt-get.cc:346
+msgid " or"
+msgstr " hay"
+
+#: cmdline/apt-get.cc:375
+msgid "The following NEW packages will be installed:"
+msgstr "Theo đây có những gói MỚI sẽ được cài:"
+
+#: cmdline/apt-get.cc:401
+msgid "The following packages will be REMOVED:"
+msgstr "Theo đây có những gói sẽ bị LOẠI BỎ:"
+
+#: cmdline/apt-get.cc:423
+msgid "The following packages have been kept back:"
+msgstr "Theo đây có những gói đã giữ lại:"
+
+#: cmdline/apt-get.cc:444
+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:465
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Theo đây có những gói sẽ bị HẠ CẤP:"
+
+#: cmdline/apt-get.cc:485
+msgid "The following held packages will be changed:"
+msgstr "Theo đây có những gói sẽ được thay đổi:"
+
+#: cmdline/apt-get.cc:538
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (do %s)"
+
+#: cmdline/apt-get.cc:546
+#, fuzzy
+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ị loại 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:577
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "Nâng cấp %lu, cài đặt mới %lu rồi."
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "Cài đặt lại %lu gói rồi."
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu downgraded, "
+msgstr "Hạ cấp %lu gói rồi."
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "Có %lu gói cần loại bỏ, và chưa nâng cấp %lu gói.\n"
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "Chưa cài đặt toàn bộ hay đã loại bỏ %lu.\n"
+
+#: cmdline/apt-get.cc:649
+msgid "Correcting dependencies..."
+msgstr "Sửa cách phụ thuộc..."
+
+#: cmdline/apt-get.cc:652
+msgid " failed."
+msgstr " thất bại.."
+
+#: cmdline/apt-get.cc:655
+msgid "Unable to correct dependencies"
+msgstr "Không thể sửa cách phụ thuộc."
+
+#: cmdline/apt-get.cc:658
+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:660
+msgid " Done"
+msgstr " Xong rồi."
+
+#: cmdline/apt-get.cc:664
+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 suốt."
+
+#: cmdline/apt-get.cc:667
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+"Còn có phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy thử tùy chọn -f."
+
+#: cmdline/apt-get.cc:689
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "Theo đây có những gói sẽ được nâng cấp:"
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr ""
+
+#: 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 "Gập lỗi thì đã dùng tùy chọn -y không có --force-yes."
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: cmdline/apt-get.cc:764
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
+msgstr ""
+"Cần phải loại bỏ một số gói, nhưng mà khả năng Loại bỏ (Remove) đã bị tắt."
+
+#: cmdline/apt-get.cc:775
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi."
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
+msgid "Unable to lock the download directory"
+msgstr "Không thể khóa thư mục tải về."
+
+#: 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 "Không thể đọc danh sách nguồn."
+
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:821
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Cần phải gói %sB/%sB kho.\n"
+
+#: cmdline/apt-get.cc:824
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Cần phải gói %sB kho.\n"
+
+#: cmdline/apt-get.cc:829
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "Sau khi đã giải nén thì sẻ dùng %sB sức chứa đĩa thêm.\n"
+
+#: cmdline/apt-get.cc:832
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "Sau khi đã giải nén thì sẽ giải phóng %sB sức chữa đĩa thêm.\n"
+
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Không đủ sức chứa trong %s."
+
+#: cmdline/apt-get.cc:849
+#, 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:864 cmdline/apt-get.cc:884
+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:866
+msgid "Yes, do as I say!"
+msgstr "Có, làm đi."
+
+#: cmdline/apt-get.cc:868
+#, fuzzy, 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:874 cmdline/apt-get.cc:893
+msgid "Abort."
+msgstr "Hủy bỏ."
+
+#: cmdline/apt-get.cc:889
+#, fuzzy
+msgid "Do you want to continue [Y/n]? "
+msgstr "Bạn có muốn tiếp tục không? [Y/n] (Có/không)"
+
+#: 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 "Không gói %s được %s\n"
+
+#: cmdline/apt-get.cc:979
+msgid "Some files failed to download"
+msgstr "Không tài một số tập tin về được."
+
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
+msgid "Download complete and in download only mode"
+msgstr "Tải về hoàn thành, trong chế độ chỉ tải về."
+
+#: cmdline/apt-get.cc:986
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Không thể gọi một số kho, có lẽ hãy chạy lệnh:\n"
+"apt-get update\n"
+"(apt gọli cập nhật) hay thử với\n"
+"--fix-missing\n"
+"(sửa khi thiếu điều) không?"
+
+#: cmdline/apt-get.cc:990
+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:995
+msgid "Unable to correct missing packages."
+msgstr "Không thể sửa khi thiếu những gói:"
+
+#: cmdline/apt-get.cc:996
+#, fuzzy
+msgid "Aborting install."
+msgstr "Đang hủy bỏ cài."
+
+#: cmdline/apt-get.cc:1030
+#, 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:1040
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Sẽ bỏ qua %s vì nó được cài và chưa lập tùy chọn Nâng cấp.\n"
+
+#: cmdline/apt-get.cc:1058
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Chưa cài gói %s nên không thể loại bỏ nó.\n"
+
+#: cmdline/apt-get.cc:1069
+#, 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:1081
+msgid " [Installed]"
+msgstr "[Đã cài]"
+
+#: cmdline/apt-get.cc:1086
+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: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 ""
+"Gói %s không phải công bố, nhưng mà một gói khác đã tham chiếu đến nó.\n"
+"Có lẽ có nghĩa là thiếu gói ấy, nó trở thành cũ, hay chỉ công bố từ nguồn "
+"khác.\n"
+
+#: cmdline/apt-get.cc:1110
+msgid "However the following packages replace it:"
+msgstr "Tuy nhiên, những gói theo đây có thay thế nó được:"
+
+#: cmdline/apt-get.cc:1113
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "Gói %s không có ứng cử cài nào."
+
+#: cmdline/apt-get.cc:1133
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Không thể cài lại %s vì không thể tải nó về.\n"
+
+#: cmdline/apt-get.cc:1141
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s là phiên bản mơi nhất rồi.\n"
+
+#: cmdline/apt-get.cc:1168
+#, 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:1170
+#, 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:1176
+#, 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:1313
+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:1326 cmdline/apt-get.cc:1420
+msgid "Unable to lock the list directory"
+msgstr "Không thể khóa thư mục danh sách."
+
+#: cmdline/apt-get.cc:1384
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Không tải một số tập tin chỉ mục về được. Như thế thì đã bỏ qua chúng, hoặc "
+"đã dùng điều cũ hơn thay thế."
+
+#: cmdline/apt-get.cc:1403
+#, fuzzy
+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:1502 cmdline/apt-get.cc:1538
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Không tìm thấy gói %s."
+
+#: cmdline/apt-get.cc:1525
+#, 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:1555
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr ""
+"Có lẽ bạn hãy chạy lênh:\n"
+"apt-get -f install\n"
+"để sửa suốt."
+
+#: cmdline/apt-get.cc:1558
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Gói phụ thuộc vào phần mềm chưa có. Hãy thử lệnh:\n"
+"apt-get -f install\n"
+"còn không có gói nào (hoặc ghi rõ cách quyết định)."
+
+#: 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"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Không thể cài một số gói. Có lẽ có nghĩa là bạn đa yêu cầu trường hợp không "
+"thể,\n"
+"hoặc nếu bạn sử dụng bản phân phối bất định thì có lẽ chưa tạo một số gói\n"
+"hay chưa di chuyển chúng ra Incoming (Đến)."
+
+#: 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 ""
+"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, thì rât có thể là không thể cài "
+"gói này, thì bạn hay thông báo lỗi cho <apt@packages.debian.org>."
+
+#: cmdline/apt-get.cc:1583
+msgid "The following information may help to resolve the situation:"
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định vấn đề này."
+
+#: cmdline/apt-get.cc:1586
+msgid "Broken packages"
+msgstr "Gói bị ngắt"
+
+#: cmdline/apt-get.cc:1612
+msgid "The following extra packages will be installed:"
+msgstr "Sẽ cài những gói thêm theo đây:"
+
+#: cmdline/apt-get.cc:1683
+msgid "Suggested packages:"
+msgstr "Gói được đệ nghị:"
+
+#: cmdline/apt-get.cc:1684
+msgid "Recommended packages:"
+msgstr "Gói được khuyến khích:"
+
+#: cmdline/apt-get.cc:1704
+#, fuzzy
+msgid "Calculating upgrade... "
+msgstr "Tính nâng cấp..."
+
+#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "Thất bại"
+
+#: cmdline/apt-get.cc:1712
+msgid "Done"
+msgstr "Xong rồi"
+
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì."
+
+#: cmdline/apt-get.cc:1885
+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 gọi nguồn cho nó:"
+
+#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Không tìm thấy góio nguồn cho %s."
+
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s.\n"
+
+#: cmdline/apt-get.cc:1983
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Không đủ sức chứa trong %s."
+
+#: cmdline/apt-get.cc:1988
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Cần phải gọi %sB/%sB kho nguồn.\n"
+
+#: cmdline/apt-get.cc:1991
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Cần phải gọi %sB kho nguồn.\n"
+
+#: cmdline/apt-get.cc:1997
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Gọi nguồn %s\n"
+
+#: cmdline/apt-get.cc:2028
+msgid "Failed to fetch some archives."
+msgstr "Không gọi một số kho được."
+
+#: cmdline/apt-get.cc:2056
+#, 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:2068
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Lệnh giải nén '%s' thất bại.\n"
+
+#: cmdline/apt-get.cc:2069
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2086
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Lệnh xây dụng '%s' thất bại.\n"
+
+#: cmdline/apt-get.cc:2105
+msgid "Child process failed"
+msgstr "Tiến trình con thất bại."
+
+#: cmdline/apt-get.cc:2121
+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:2149
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Không thể gọi thông tin về cách phụ thuộc khi xây dụng cho %s."
+
+#: cmdline/apt-get.cc:2169
+#, 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:2221
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "%s phụ thuộc vào %s mà chưa có, vì không tìm thấy gọi %s."
+
+#: 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 ""
+"%s phụ thuộc vào %s mà chưa có, vì không có phiên bản công bố của gói %s có "
+"thể khớp với điều kiện phiên bản."
+
+#: cmdline/apt-get.cc:2308
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr "%s phụ thuộc vào %s mà chưa có, vì gói đã cài %s quá mới."
+
+#: cmdline/apt-get.cc:2333
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "%s phụ thuộc vào %s mà chưa có: %s."
+
+#: cmdline/apt-get.cc:2347
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "%s phụ thuộc vào phần mềm khi xây dụng mà không thể có."
+
+#: cmdline/apt-get.cc:2351
+msgid "Failed to process build dependencies"
+msgstr "Không xử lý cách phụ thuộc khi xây dụng được."
+
+#: cmdline/apt-get.cc:2383
+#, fuzzy
+msgid "Supported modules:"
+msgstr "Mô-đun đã hỗ trợ:"
+
+#: cmdline/apt-get.cc:2424
+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: \tgọi\n"
+"install: \tcài\n"
+"remove: \tloại 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 gói. Những lệnh "
+"đã dùng thường nhất là update (cập nhật) và install (cài).\n"
+"\n"
+"Lệnh:\n"
+" update\t\tGọi 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_Loại 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_, hãy xem tài liệu 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ề (_sạch_)\n"
+" autoclean \tXóa bỏ các tập tin kho cũ đã tải về (_tự động 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 - 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ề_, KHÔNG cài hay giản 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 có câu hỏi; không nhắc người dùng "
+"gõ gì\n"
+" -f \t\tCố tiếp tục nếu kiểm tra sự hợp nhất _thất bại_\n"
+" -m \tCố tiếp tục nếu không thể định vị kho\n"
+" -u \tCũng hiển thị danh sách các gói đã _nâng cấp_\n"
+" -b \t_Xây dụng_ gói nguồn sau khi gọi nó\n"
+" -V \tHiển thị số _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 "Gọi:"
+
+#: 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 "Gọi %sB mất %s (%sB/s) rồi.\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Hoạt động]"
+
+#: cmdline/acqprogress.cc:271
+#, fuzzy, 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 phương tiện: 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 ấy."
+
+#: 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"
+"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 được 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 ấ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."
+
+#: 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ẽ định cấu hình"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "những gói đã cài đặt. Có lẽ sẽ gây ra những lỗi nhân bản"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "hoặc nhưng lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó."
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"Tùy nhiên, chỉ những lỗi ở trên thông điệp này là quan trọng.\n"
+"Hãy sửa chúng và chạy lại [I]nstall."
+
+#: dselect/update:30
+#, fuzzy
+msgid "Merging available information"
+msgstr "Đang hợp nhất các thông tin công bố"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Không tạo những ống được."
+
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "
+msgstr "Không thực hiện gzip được."
+
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+msgid "Corrupted archive"
+msgstr "Kho bị hỏng."
+
+#: apt-inst/contrib/extracttar.cc:195
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tiến trình tar checksum thât bại: kho bị hỏng."
+
+#: apt-inst/contrib/extracttar.cc:298
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Không biết kiểu phần đầu tar %u, mục thuộc %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 mục thuộc kho."
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "Phần đầu mục thuộc 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 "Không đọc phần đầu kho được."
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "Đã gọi DropNode (thả điểm nút) 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 "Không định vi phần tử băm được."
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "Không phân chia sự trệch đi."
+
+#: apt-inst/filelist.cc:468
+#, fuzzy
+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 "Đã thêm sự trệch đi 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 nhân bản %s/%s."
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Không ghi vào tập tin %s được."
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Không đóng tập tin %s được."
+
+#: 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 đã làm 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 đ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 do điều không phải là thư mục đang thay thế."
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Không định vị điểm nút trong hộp băm nó."
+
+#: 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, với 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ể gọi 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 "Không loại bỏ %s được."
+
+#: 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 "Không gọi các thông tin về %sinfo được."
+
+#: 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:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+#, fuzzy
+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 "Không chuyển đổi tới thư mục quản lý %sinfo được."
+
+#: 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 "Gặp lỗi nội bộ khi gọi tên gói."
+
+#: apt-inst/deb/dpkgdb.cc:205
+#, fuzzy
+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 ""
+"Không mở tập tin danh sách '%sinfo/%s' được. 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 lại phiên bản gói ấy."
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Không đọc tập tin danh sách %sinfo/%s được."
+
+#: apt-inst/deb/dpkgdb.cc:266
+#, fuzzy
+msgid "Internal error getting a node"
+msgstr "Gặp lỗi nội bộ khi gọi nút điểm."
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Không mở tập tin trệch đi %sdiversions được."
+
+#: 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
+#, fuzzy
+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
+#, fuzzy
+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:386
+#, fuzzy
+msgid "Reading file list"
+msgstr "Đang đọc danh sách tâp tin..."
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, fuzzy, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Không tìm thấy phần đầi Gói (Package) được, 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ì thiếu phần '%s'."
+
+#: apt-inst/deb/debfile.cc:52
+#, fuzzy, 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ì thiếu phần '%s'."
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Không thể thay đổi thành %s."
+
+#: apt-inst/deb/debfile.cc:138
+#, fuzzy
+msgid "Internal error, could not locate member"
+msgstr "Gặp lỗi nội bộ, không thể định vị phần."
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "Không định vị tập tin điều khiển hợp lệ được."
+
+#: apt-inst/deb/debfile.cc:256
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Tập tin điều khiển không thể 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
+#, fuzzy
+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 (gọi cập nhật) để thêm đĩa CD mới nào."
+
+#: methods/cdrom.cc:131
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "Không phải đĩa CD đú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
+#, fuzzy
+msgid "Disk not found."
+msgstr "Không tìm thấy tập tin."
+
+#: 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:265 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "Không gọi các thông tin được."
+
+#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "Không lập giờ sửa đổi được."
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Địa chỉ Mạng không hợp lệ: không thể bắt đầu địa chỉ Mạng bằng //"
+
+#. 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
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Máy chủ từ chối kết nối với chúng tô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 chủ 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 chủ 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 chủ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập.\n"
+"Acquire::ftp::ProxyLogin\n"
+"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 chủ 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 chủ nói: %s."
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Kết nối thời hạn"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "Máy chủ đã đóng kết nối này rồ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 rồi."
+
+#: 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 thời hạn rồi."
+
+#: 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 (gọi thông tin địa chỉ) không thể lấy ổ cắm 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 ấy."
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Không thể quyết định tên ổ cắm ấy."
+
+#: 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 chủ nói: %s."
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Kết nối ổ cắm dữ liệu thời hạn rồi."
+
+#: 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:963 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Gặp khó khi băm tập tin."
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Không thể gọi tập tin: máy chủ nói '%s'."
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Ổ cắm dữ liệu thời hạn rồi."
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Không chuyển dữ liệu được: máy chủ nói '%s'."
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Truy vấn"
+
+#: methods/ftp.cc:1106
+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ể khởi động 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 thời hạn rồi."
+
+#: methods/connect.cc:106
+#, 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:134 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Đang kết nối đến %s."
+
+#: methods/connect.cc:165
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Không thể tháo gỡ '%s'."
+
+#: methods/connect.cc:171
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Không tháo gỡ '%s' được tạm thời."
+
+#: methods/connect.cc:174
+#, 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:221
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Không thể kết nối đến %s %s:"
+
+#: methods/gpgv.cc:92
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:191
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:196
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#. FIXME String concatenation considered harmful.
+#: methods/gpgv.cc:201
+#, fuzzy
+msgid "Could not execute "
+msgstr "Không thể gọi khóa %s."
+
+#: methods/gpgv.cc:202
+msgid " to verify signature (is gnupg installed?)"
+msgstr ""
+
+#: methods/gpgv.cc:206
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:237
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "Sẽ cài những gói thêm theo đây:"
+
+#: methods/gpgv.cc:244
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Không thể mở ống 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:381
+msgid "Waiting for headers"
+msgstr "Đang đợi những phần đầu."
+
+#: methods/http.cc:527
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Đã gọi một dòng đầu riêng lẻ chứa hơn %u ky tự."
+
+#: methods/http.cc:535
+msgid "Bad header line"
+msgstr "Dòng đầu sai."
+
+#: methods/http.cc:554 methods/http.cc:561
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Máy chủ http đã gởi một dòng đầu trả lời không hợp lệ."
+
+#: methods/http.cc:590
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr ""
+"Máy chủ http đã gởi một dòng đầu Độ dài nội dụng (Content-Length) không hợp "
+"lệ."
+
+#: methods/http.cc:605
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr ""
+"Máy chủ http đã gởi một dòng đầu Phạm vị nội dụng (Content-Range) không hợp "
+"lệ."
+
+#: methods/http.cc:607
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Máy chủ http này có sự hỗ trơ phạm vị bị ngắt."
+
+#: methods/http.cc:631
+msgid "Unknown date format"
+msgstr "Không biết dạng ngày ấy."
+
+#: methods/http.cc:778
+msgid "Select failed"
+msgstr "Không chọn được."
+
+#: methods/http.cc:783
+msgid "Connection timed out"
+msgstr "Kết nối đã thời hạn rồi."
+
+#: methods/http.cc:806
+msgid "Error writing to output file"
+msgstr "Gặp lỗi khi ghi vào tập tin xuất."
+
+#: methods/http.cc:837
+msgid "Error writing to file"
+msgstr "Gặp lỗi khi ghi vào tập tin."
+
+#: methods/http.cc:865
+msgid "Error writing to the file"
+msgstr "Gặp lỗi khi ghi vào tập tin ấy."
+
+#: methods/http.cc:879
+#, fuzzy
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gặp lỗi khi đọc từ máy chủ: cuối cùng ở xa đã đóng kết nối rồi."
+
+#: methods/http.cc:881
+msgid "Error reading from server"
+msgstr "Gặp lỗi khi đọc từ máy chủ."
+
+#: methods/http.cc:1112
+#, fuzzy
+msgid "Bad header data"
+msgstr "Dữ liệu dòng đầu sai."
+
+#: methods/http.cc:1129
+msgid "Connection failed"
+msgstr "Không kết nối được."
+
+#: methods/http.cc:1220
+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ớ) một 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ớ) của %lu byte."
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "Không tìm thấy điều đã 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 (%d tối đa)."
+
+#: 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
+#, fuzzy, 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 đỉnh."
+
+#: 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 rồi."
+
+#: 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 boolean (chỉ có hai trả lời: thật và không "
+"thật)."
+
+#: 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: lời ghi rõ mục cấu hình phải có một =<val>."
+
+#: 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 có nghĩa nào: hãy thử true (thật) hay false (không thật)."
+
+#: 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ể gọi 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ể thay đổi thành %s."
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "Không gọi cac thông tin cho đĩa CD-ROM được."
+
+#: 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 đã gắn kết kiểu NFS %s."
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Không thể gọi khóa %s."
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, fuzzy, 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ột 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 nào 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 ấy."
+
+#: 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 ấy."
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "Gặp lỗi khi đồng bộ hóa tập tin ấy."
+
+#: 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
+#, fuzzy, 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ểm 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 khích"
+
+#: 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 cho 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 "nữa"
+
+#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Đang xây dụng cây cách phụ thuộc."
+
+#: apt-pkg/depcache.cc:61
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
+
+#: apt-pkg/depcache.cc:90
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Tạo cách phụ thuộc"
+
+#: apt-pkg/tagfile.cc:73
+#, 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:160
+#, 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
+#, fuzzy, 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 ""
+"Chạy tiến trình cài đặt này sẽ cần thiết loại bỏ gói chủ yếu %s tạm thời, do "
+"vong lăp Xung đột/Phụ thuộc trước. Làm như thế thường xấu, nhưng mà nếu bạn "
+"thật sự muốn tiếp tục thì có thể hoạt hóa tuy chọn APT::Force-LoopBreak."
+
+#: 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:241
+#, 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:1059
+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:1061
+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."
+
+#: apt-pkg/acquire.cc:821
+#, c-format
+msgid "Downloading file %li of %li (%s remaining)"
+msgstr ""
+
+#: 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 hỗ trợ 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:377
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Chuyển đổi phương tiện: hãy nạp đĩa có nhãn\n"
+" '%s'\n"
+"vào ổ '%s' và bấm nút Enter\n"
+
+#: apt-pkg/init.cc:120
+#, 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:136
+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ể gọi các thông tin cho %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 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 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 (gọi 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 Gói "
+"(Package)."
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Chưa 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:74
+msgid "Cache has an incompatible versioning system"
+msgstr "Bộ nhớ tạn có hệ thống điêu khiển phiên bản không tương thích."
+
+#: apt-pkg/pkgcachegen.cc:117
+#, fuzzy, 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:129
+#, fuzzy, 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:150
+#, fuzzy, 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:154
+#, fuzzy, 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:184
+#, fuzzy, 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:188
+#, fuzzy, 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:192
+#, fuzzy, 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:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Hay quá, 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:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Hay quá, 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:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Hay quá, 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:241
+#, fuzzy, 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:254
+#, fuzzy, 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 gói phụ "
+"thuộc vào một tập tin)"
+
+#: apt-pkg/pkgcachegen.cc:260
+#, 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:574
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Không thể gọi các thông tin cho danh sách gói nguồn %s."
+
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
+msgstr "Đang tập hợp các trường hợp gói phụ thuộc vào một tập tin."
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "Lỗi gõ/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 "không đổi tên được, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+msgid "MD5Sum mismatch"
+msgstr "Không khớp MD5Sum (tổng kiểm)."
+
+#: 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 ""
+"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: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 ""
+"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:814
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Các tập tin mục lục của gói ấy bị hỏng. Không có trường Filename: (Tên tập "
+"tin:) cho gói %s."
+
+#: apt-pkg/acquire-item.cc:901
+msgid "Size mismatch"
+msgstr "Không khớp cỡ."
+
+#: apt-pkg/vendorlist.cc:66
+#, fuzzy, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Khối nhà bán %s không hợp lệ."
+
+#: apt-pkg/cdrom.cc:507
+#, 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
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:583
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Đang đợi những phần đầu."
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:730
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Đang đọc các danh sách gói."
+
+#: apt-pkg/cdrom.cc:754
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Dòng %u quá dài trong danh sách nguồn %s."
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Đang mở %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Đang mở %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Đang mở tập tin cấu hình %s."
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Đang kết nối đến %s."
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Đã cài đặt: "
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Đang mở %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Khuyến khích"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing for remove with config %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Removed with config %s"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Kết nối bị đóng quá sớm."
+
+#~ msgid "Write Error"
+#~ msgstr "Lỗi ghi"
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "Không biết mã nhận biết nhà bán '%s' trên dòng %u trong danh sách nguồn %"
+#~ "s."
+
+#~ msgid "File Not Found"
+#~ msgstr "Không tìm thấy tập tin."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1a4759955..3d4d988ec 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.
+# Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
#
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-01-04 18:51+0100\n"
+"PO-Revision-Date: 2005-11-15 00:05+0800\n"
+"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\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"
@@ -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 for %s %s ,编译于 %s %s\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,7 +296,7 @@ msgstr ""
"\n"
"选项:\n"
" -h 本帮助文本\n"
-" -t 设置temp目录\n"
+" -t 设置 temp 目录\n"
" -c=? 读指定的配置文件\n"
" -o=? 设置任意指定的配置选项,例如 -o dir::cache=/tmp\n"
@@ -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"
@@ -509,12 +521,12 @@ msgstr "无法读取 %s 的状态"
msgid "Archive had no package field"
msgstr "存档没有包含软件包(package)字段"
-#: 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 " %s 中没有 override 项\n"
-#: 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"
@@ -614,257 +626,255 @@ msgstr "在 unlink %s 时出错"
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 "编译正则表达式时出错 - %s"
-#: 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
-#, fuzzy
+#: 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: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 "无法使升级的软件包集最小化"
+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
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】:下列的软件包不能通过认证!"
+msgstr "【警告】:下列的软件包不能通过验证!"
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "忽略了认证警告。\n"
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
msgid "Install these packages without verification [y/N]? "
msgstr "不经验证就安装这些软件包么?[y/N] "
-#: 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。"
+msgstr "碰到了一些问题,您使用了 -y 选项,但是没有用 --force-yes"
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "内部错误,InstallPackages 被用在了无法安装的软件包上!"
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:775
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: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 ""
+msgstr "怪了……文件大小不符,发信给 apt@packages.debian.org 吧"
-#: 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
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "您在 %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 "虽然您指定了 Trivial Only,但这不是个日常(trivial)操作。"
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
msgid "Yes, do as I say!"
msgstr "Yes, do as I say!"
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: 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"
+"您的操作会导致潜在的危害。\n"
"若还想继续的话,就输入下面的短句“%s”\n"
" ?] "
-#: 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
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?"
@@ -872,47 +882,47 @@ msgstr ""
"有几个软件包无法下载,您可以运行 apt-get update 或者加上 --fix-missing 的选项"
"再试试?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前还不支持 --fix-missing 和介质交换(media swapping)"
-#: 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 "注意,我选了 %s 而非 %s\n"
-#: 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 "忽略了 %s,它已经被安装而且没有指定要升级。\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "软件包 %s 还未安装,因而不会被卸载\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "软件包 %s 是一个由下面的软件包提供的虚拟软件包:\n"
-#: 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"
@@ -923,74 +933,74 @@ msgstr ""
"这可能意味着这个缺失的软件包可能已被废弃,\n"
"或者只能在其他发布源中找到\n"
-#: 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 "软件包 %s 还没有可供安装的候选者"
-#: 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 "不能重新安装 %s,因为无法下载它。\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "%s 已经是最新的版本了。\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”发布版本"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "选定了版本为 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr " update 命令是不需任何参数的"
-#: 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 "内部错误,AllUpgrade 造成某些故障"
+msgstr "内部错误,AllUpgrade 坏事了"
-#: 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 "无法找到软件包 %s"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -998,7 +1008,7 @@ msgstr ""
"有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
"以指定一个解决办法)。"
-#: 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"
@@ -1009,7 +1019,7 @@ msgstr ""
"因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
"包尚未被创建或是它们还在新到(incoming)目录中。"
-#: 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"
@@ -1018,122 +1028,126 @@ msgstr ""
"您仅要求对单一软件包进行操作,这极有可能是因为该软件包安装不上,同时,\n"
"您最好提交一个针对这个软件包的故障报告。"
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1583
msgid "The following information may help to resolve the situation:"
-msgstr "下列的信息可能会对问题的解决有所帮助:"
+msgstr "下列的信息可能会对解决问题有所帮助:"
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1586
msgid "Broken packages"
-msgstr "受损安装包"
+msgstr "无法安装的软件包"
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1612
msgid "The following extra packages will be installed:"
-msgstr "将会安装下列的额外的软件包:"
+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
-#, fuzzy
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
msgid "Internal error, problem resolver broke stuff"
-msgstr "内部错误,AllUpgrade 造成某些故障"
+msgstr "内部错误,problem resolver 坏事了"
-#: 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 "无法找到与 %s 对应的源代码包"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "您在 %s 上没有足够的空余空间"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下载 %sB 的源代码包。\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "下载源代码 %s\n"
-#: 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 "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "运行解包的命令“%s”出错。\n"
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2069
#, 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:2086
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "执行构造软件包命令“%s”失败。\n"
-#: 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 "要检查生成软件包的构建依赖关系(builddeps),必须指定至少一个软件包"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr " %s 没有构建依赖关系信息。\n"
-#: 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 "由于无法找到软件包 %3$s ,因此不能满足 %2$s 所要求的 %1$s 依赖关系"
-#: 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 "
@@ -1142,30 +1156,30 @@ msgstr ""
"由于无法找到符合要求的软件包 %3$s 的可用版本,因此不能满足 %2$s 所要求的 %1"
"$s 依赖关系"
-#: 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 "无法满足 %2$s 所要求 %1$s 依赖关系:已安装的软件包 %3$s 太新了"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, 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:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
-#: 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"
@@ -1411,11 +1425,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 +1482,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"
@@ -1626,12 +1641,11 @@ 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"
@@ -1769,7 +1783,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 "把文件加入散列表时出错"
@@ -1855,41 +1869,39 @@ msgstr "不能连接上 %s %s:"
#: methods/gpgv.cc:92
msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "错误:Acquire::gpgv::Options 的参数列表超长。结束运行。"
#: methods/gpgv.cc:191
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部错误:签名正确无误,但是无法确认密钥的指纹(key fingerprint)?!"
#: methods/gpgv.cc:196
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"
+msgstr "未能执行 "
#: methods/gpgv.cc:202
msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr "用于验证签名(您安装了 gnupg 么?)"
#: methods/gpgv.cc:206
msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "运行 gpgv 时发生未知错误"
#: methods/gpgv.cc:237
-#, fuzzy
msgid "The following signatures were invalid:\n"
-msgstr "将会安装下列的额外的软件包:"
+msgstr "下列签名无效:\n"
#: methods/gpgv.cc:244
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 +1913,76 @@ msgstr "无法为 %s 开启管道"
msgid "Read error from %s process"
msgstr "从 %s 进程读取数据出错"
-#: 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 "受到了一行报头条目,它的长度超过了 %u 个字符"
-#: 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 "该 http 服务器发送了一个无效的应答报头"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "该 http 服务器的 range 支持不正常"
-#: 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 "select 调用出错"
-#: 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 "内部错误"
@@ -1983,7 +1995,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 +2116,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"
@@ -2271,52 +2283,52 @@ msgstr "无法解析软件包文件 %s (1)"
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)"
@@ -2367,10 +2379,10 @@ msgstr "软件包列表的目录 %spartial 不见了。"
msgid "Archive directory %spartial is missing."
msgstr "找不到“%spartial”这个目录。"
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "正在下载第 %li 个文件(共 %li 个,尚需 %s)"
#: apt-pkg/acquire-worker.cc:113
#, c-format
@@ -2383,19 +2395,16 @@ msgid "Method %s did not start correctly"
msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动。"
#: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "不支持“%s”打包系统"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "无法确定适合的打包系统类型"
@@ -2406,7 +2415,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."
@@ -2513,11 +2522,11 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5 校验和不符"
-#: 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 "
@@ -2526,7 +2535,7 @@ msgstr ""
"我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
"包。(缘于架构缺失)"
-#: 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 "
@@ -2534,13 +2543,13 @@ msgid ""
msgstr ""
"我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
-#: 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 "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段"
+msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "大小不符"
@@ -2644,54 +2653,54 @@ 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 ""
+msgstr "正在准备连同配置文件的删除 %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
msgid "Removed with config %s"
-msgstr ""
+msgstr "连同配置文件一同删除 %s "
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c9f4657ca..43be4c21b 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-01-04 18:51+0100\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"
@@ -149,7 +149,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"
@@ -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 "參數並非一對"
@@ -511,12 +527,12 @@ msgstr "無法取得 %s 的狀態"
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 " %s 無 override 項目\n"
-#: 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"
@@ -616,79 +632,79 @@ msgstr "在 unlink %s 時出錯"
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 "編譯正規表示法出錯 - %s"
-#: 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 "但是『%s』卻還沒有安裝。"
-#: 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"
@@ -697,144 +713,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
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 "不驗證這些套件就直接安裝?[y/N]"
-#: 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
#, 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: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 "需要下載 %2$sB 中 %1$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 "雖然您指定了 Trivial Only,但這不是個顯而易懂的(trivial)操作。"
-#: 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
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -845,28 +861,28 @@ msgstr ""
"若要繼續的話,就輸入下面的句子“%s”\n"
" ?] "
-#: 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
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?"
@@ -874,47 +890,47 @@ msgstr ""
"有幾個檔案無法下載,您可以執行 apt-get update 或者嘗試加上--fix-missing \n"
"選項?"
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
msgid "--fix-missing and media swapping is not currently supported"
msgstr "目前還不支援 --fix-missing 和媒體置換(media swapping)"
-#: 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 "注意,選擇了 %s 而非 %s\n"
-#: 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 "忽略 %s,它已經被安裝而且沒有指定要升級。\n"
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "套件『%s』沒有安裝,所以無法刪除。\n"
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "虛擬套件『%s』的提供者是:\n"
-#: 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"
@@ -925,73 +941,73 @@ msgstr ""
"這可能意味著這個套件已經消失或捨棄,\n"
"或者只能在其他原碼中找到\n"
-#: 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 "套件 %s 還沒有可供安裝的候選版本"
-#: 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 "不能重新安裝 %s,因為無法下載它。\n"
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
#, c-format
msgid "%s is already the newest version.\n"
msgstr "『%s』已經是最新版本了。\n"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”發布版本"
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "未找到“%2$s”的“%1$s”版本"
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "選定的版本為 %s (%s) 的 %s\n"
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
msgid "The update command takes no arguments"
msgstr "update 指令不需任何參數"
-#: 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 "內部錯誤,AllUpgrade 造成錯誤"
-#: 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 "無法找到 %s 套件。"
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1525
#, 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:1555
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:1558
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -999,7 +1015,7 @@ msgstr ""
"無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
"定一個解決辦法)。"
-#: 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"
@@ -1010,7 +1026,7 @@ msgstr ""
"或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
"或從 Incoming 目錄移除。"
-#: 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"
@@ -1020,122 +1036,127 @@ msgstr ""
"該套件無法安裝,您最好提交一個針對這個套件\n"
"的臭蟲報告。"
-#: 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 "建議(Suggested)的套件:"
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1684
msgid "Recommended packages:"
msgstr "推薦(Recommended)的套件:"
-#: 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 "內部錯誤,AllUpgrade 造成錯誤"
-#: 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 "無法找到 %s 套件的源碼"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1959
+#, fuzzy, c-format
+msgid "Skiping already downloaded file '%s'\n"
+msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
+
+#: cmdline/apt-get.cc:1983
#, c-format
msgid "You don't have enough free space in %s"
msgstr "『%s』內沒有足夠的空間。"
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1988
#, 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:1991
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "需要下載 %sB 的原始檔案。\n"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1997
#, c-format
msgid "Fetch source %s\n"
msgstr "下載源碼 %s\n"
-#: 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 "略過已經被解開到 %s 目錄的源碼檔案\n"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2068
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "執行解開套件指令 '%s' 時失敗。\n"
-#: 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 "執行建立套件指令 '%s' 時失敗。\n"
-#: 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 "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2149
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "無法取得 %s 的建構相依關係。"
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2169
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s 無建立相依關係訊息。\n"
-#: 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 "由於無法找到套件 %3$s ,因此不能滿足 %2$s 所要求的 %1$s 相依關係"
-#: 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 "
@@ -1144,30 +1165,30 @@ msgstr ""
"由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
"相依關係"
-#: 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 "無法滿足 %2$s 所要求 %1$s 相依關係:已安裝的套件 %3$s 太新了"
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2333
#, 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:2347
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "無法滿足套件 %s 所要求的建構相依關係。"
-#: 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"
@@ -1419,7 +1440,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 +1493,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』。"
@@ -1772,7 +1794,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:963 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "問題雜湊表"
@@ -1904,76 +1926,76 @@ msgstr "無法開啟管線給 %s 使用"
msgid "Read error from %s process"
msgstr "從 %s 進程讀取錯誤"
-#: 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 "取得一個單行超過 %u 字元的標頭"
-#: 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 "http 伺服器傳送一個無效的回覆標頭"
-#: methods/http.cc:553
+#: methods/http.cc:590
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
-#: methods/http.cc:568
+#: methods/http.cc:605
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
-#: methods/http.cc:570
+#: methods/http.cc:607
msgid "This HTTP server has broken range support"
msgstr "http 伺服器有損毀的範圍支援"
-#: 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 "Select 失敗"
-#: 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 "內部錯誤"
@@ -1986,7 +2008,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 +2129,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』目錄。"
@@ -2274,52 +2296,52 @@ msgstr "無法辨識套件『%s』(1)。"
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 行有錯誤 (商家名稱)。"
@@ -2365,7 +2387,7 @@ msgstr "找不到『%spartial』清單目錄。"
msgid "Archive directory %spartial is missing."
msgstr "找不到『%spartial』檔案目錄。"
-#: apt-pkg/acquire.cc:817
+#: apt-pkg/acquire.cc:821
#, c-format
msgid "Downloading file %li of %li (%s remaining)"
msgstr ""
@@ -2388,12 +2410,12 @@ msgstr ""
" '%s' 的光碟\n"
"插入 '%s' 碟機,然後按 [Enter] 鍵。\n"
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "本軟體不支持『%s』包裝法。"
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
msgid "Unable to determine a suitable packaging system type"
msgstr "無法明白系統類別。"
@@ -2511,31 +2533,31 @@ 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:911
msgid "MD5Sum mismatch"
msgstr "MD5 檢查碼不符合。"
-#: 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 "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: 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 "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
-#: 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 "套件『%s』索引檔損壞—缺少『Filename:』欄。"
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:901
msgid "Size mismatch"
msgstr "檔案大小不符合。"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
index c391d8fa1..ce412117d 100644
--- a/share/debian-archive.gpg
+++ b/share/debian-archive.gpg
Binary files differ