* merged with mainline

author: Michael Vogt <michael.vogt@ubuntu.com> 2006-06-26 06:30:09 +0200
committer: Michael Vogt <michael.vogt@ubuntu.com> 2006-06-26 06:30:09 +0200
commit: a23dcda4a75ead3ef9712d90300f45155856b6ce (patch)
tree: 8951be2e20b5403c4339fa246b59d7770c8e2e46
parent: bc03039d0f532b6463de33bff60c7d876af6ea5e (diff)
parent: b90d7d855709c49a6d5faff0ac65b96fd15e4500 (diff)
100 files changed, 21857 insertions, 11537 deletions
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index c6a0e80e6..718e1ab98 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress)
       return _error->Error(_("The pkg cache must be initialized first"));
    if (FList != 0)
    {
-      Progress.OverallProgress(1,1,1,_("Reading file list"));
+      Progress.OverallProgress(1,1,1,_("Reading file listing"));
       return true;
    }
    
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 88c25de43..1fa929aad 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -340,12 +340,6 @@ pkgAcqMetaSig::pkgAcqMetaSig(pkgAcquire *Owner,
       // File was already in place.  It needs to be re-verified
       // because Release might have changed, so Move it into partial
       Rename(Final,DestFile);
-      // unlink the file and do not try to use I-M-S and Last-Modified
-      // if the users proxy is broken
-      if(_config->FindB("Acquire::BrokenProxy", false) == true) {
-	 std::cerr << "forcing re-get of the signature file as requested" << std::endl;
-	 unlink(DestFile.c_str());
-      }
    }
 
    QueueURI(Desc);
@@ -395,18 +389,19 @@ void pkgAcqMetaSig::Done(string Message,unsigned long Size,string MD5,
 									/*}}}*/
 void pkgAcqMetaSig::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 {
-   // Delete any existing sigfile, so that this source isn't
-   // mistakenly trusted
-   string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
-   unlink(Final.c_str());
 
-   // if we get a timeout if fail
+   // if we get a network error we fail gracefully
    if(LookupTag(Message,"FailReason") == "Timeout" || 
-      LookupTag(Message,"FailReason") == "TmpResolveFailure") {
+      LookupTag(Message,"FailReason") == "TmpResolveFailure" ||
+      LookupTag(Message,"FailReason") == "ConnectionRefused") {
       Item::Failed(Message,Cnf);
       return;
    }
 
+   // Delete any existing sigfile when the acquire failed
+   string Final = _config->FindDir("Dir::State::lists") + URItoFileName(RealURI);
+   unlink(Final.c_str());
+
    // queue a pkgAcqMetaIndex with no sigfile
    new pkgAcqMetaIndex(Owner, MetaIndexURI, MetaIndexURIDesc, MetaIndexShortDesc,
 		       "", IndexTargets, MetaIndexParser);
@@ -430,7 +425,7 @@ pkgAcqMetaIndex::pkgAcqMetaIndex(pkgAcquire *Owner,
 				 const vector<struct IndexTarget*>* IndexTargets,
 				 indexRecords* MetaIndexParser) :
    Item(Owner), RealURI(URI), SigFile(SigFile), AuthPass(false),
-   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets)
+   MetaIndexParser(MetaIndexParser), IndexTargets(IndexTargets), IMSHit(false)
 {
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
@@ -523,6 +518,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");
@@ -551,7 +549,7 @@ void pkgAcqMetaIndex::AuthDone(string Message)
       return;
    }
 
-   if (!VerifyVendor())
+   if (!VerifyVendor(Message))
    {
       return;
    }
@@ -609,7 +607,7 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)
    }
 }
 
-bool pkgAcqMetaIndex::VerifyVendor()
+bool pkgAcqMetaIndex::VerifyVendor(string Message)
 {
 //    // Maybe this should be made available from above so we don't have
 //    // to read and parse it every time?
@@ -634,6 +632,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();
 
@@ -642,7 +656,7 @@ bool pkgAcqMetaIndex::VerifyVendor()
       Transformed = "experimental";
    }
 
-   string::size_type pos = Transformed.rfind('/');
+   pos = Transformed.rfind('/');
    if (pos != string::npos)
    {
       Transformed = Transformed.substr(0, pos);
@@ -688,10 +702,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
@@ -1037,7 +1071,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 c34b5ef69..da1bea801 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -151,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);
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 57cf60bfe..fff1b2b6a 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -818,7 +818,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner)
       unsigned long ETA =
 	 (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS);
 
-      snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str());
+      // only show the ETA if it makes sense
+      if (ETA > 0 && ETA < 172800 /* two days */ )
+	 snprintf(msg,sizeof(msg), _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str());
+      else
+	 snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems);
+	 
+
 
       // build the status str
       status << "dlstatus:" << i
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index b11d2531c..d0dc7a260 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -504,11 +504,12 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
 	 return _error->Error("Problem parsing Provides line");
-      if (Op != pkgCache::Dep::NoOp)
-	 return _error->Error("Malformed provides line");
-
-      if (NewProvides(Ver,Package,Version) == false)
-	 return false;
+      if (Op != pkgCache::Dep::NoOp) {
+	 _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
+      } else {
+	 if (NewProvides(Ver,Package,Version) == false)
+	    return false;
+      }
 
       if (Start == Stop)
 	 break;
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc
index aeee61929..064d8fa5b 100644
--- a/apt-pkg/deb/debversion.cc
+++ b/apt-pkg/deb/debversion.cc
@@ -59,7 +59,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd,
    }
 
    /* Iterate over the whole string
-      What this does is to spilt the whole string into groups of
+      What this does is to split the whole string into groups of
       numeric and non numeric portions. For instance:
          a67bhgs89
       Has 4 portions 'a', '67', 'bhgs', '89'. A more normal:
@@ -140,6 +140,27 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd,
    if (rhs == BEnd)
       rhs = B;
    
+   // Special case: a zero epoch is the same as no epoch,
+   // so remove it.
+   if (lhs != A)
+   {
+      for (; *A == '0'; ++A);
+      if (A == lhs)
+      {
+	 ++A;
+	 ++lhs;
+      }
+   }
+   if (rhs != B)
+   {
+      for (; *B == '0'; ++B);
+      if (B == rhs)
+      {
+	 ++B;
+	 ++rhs;
+      }
+   }
+
    // Compare the epoch
    int Res = CmpFragment(A,lhs,B,rhs);
    if (Res != 0)
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index fe8fbca74..667db8ff2 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -375,8 +375,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
       },
       // Purge operation
       { 
-	 {"config-files", _("Preparing for remove with config %s")},
-	 {"not-installed", _("Removed with config %s")},
+	 {"config-files", _("Preparing to completely remove %s")},
+	 {"not-installed", _("Completely removed %s")},
 	 {NULL, NULL}
       },
    };
@@ -623,8 +623,8 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited
 	    
 	 */
-	 char* list[4];
-	 TokSplitString(':', line, list, 5);
+	 char* list[5];
+	 TokSplitString(':', line, list, sizeof(list)/sizeof(list[0]));
 	 char *pkg = list[1];
 	 char *action = _strstrip(list[2]);
 
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 22dd53f97..6eb6c1d85 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -24,6 +24,7 @@
 
 #include <iostream>
 #include <sstream>    
+
 #include <apti18n.h>    
 
 pkgDepCache::ActionGroup::ActionGroup(pkgDepCache &cache) :
@@ -837,9 +838,14 @@ void pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst,
 	    }
 	 }
 	 
-	 if (InstPkg.end() == false)
+	 if (InstPkg.end() == false) 
+	 {
+	    if(_config->FindB("Debug::pkgDepCache::AutoInstall",false) == true)
+	       std::clog << "Installing " << InstPkg.Name() 
+			 << " as dep of " << Pkg.Name() 
+			 << std::endl;
 	   MarkInstall(InstPkg, true, Depth + 1, false);
-	 
+	 }
 	 continue;
       }
       
diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index cae0fa819..79ff18de4 100644
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -35,20 +35,20 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
      Fd(*pFd),
      Size(Size)
 {
-   if (Fd.IsOpen() == false)
+   if (Fd.IsOpen() == false || Fd.Size() == 0)
    {
       Buffer = 0;
       Start = End = Buffer = 0;
-      Done = true;
       iOffset = 0;
+      Map = NULL;
       return;
    }
    
-   Buffer = new char[Size];
-   Start = End = Buffer;
-   Done = false;
+   Map = new MMap (Fd, MMap::Public | MMap::ReadOnly);
+   Buffer = (char *) Map->Data ();
+   Start = Buffer;
+   End = Buffer + Map->Size ();
    iOffset = 0;
-   Fill();
 }
 									/*}}}*/
 // TagFile::~pkgTagFile - Destructor					/*{{{*/
@@ -56,7 +56,7 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) :
 /* */
 pkgTagFile::~pkgTagFile()
 {
-   delete [] Buffer;
+   delete Map;
 }
 									/*}}}*/
 // TagFile::Step - Advance to the next section				/*{{{*/
@@ -64,14 +64,13 @@ pkgTagFile::~pkgTagFile()
 /* If the Section Scanner fails we refill the buffer and try again. */
 bool pkgTagFile::Step(pkgTagSection &Tag)
 {
+   if (Start == End)
+      return false;
+
    if (Tag.Scan(Start,End - Start) == false)
    {
-      if (Fill() == false)
-	 return false;
-      
-      if (Tag.Scan(Start,End - Start) == false)
-	 return _error->Error(_("Unable to parse package file %s (1)"),
-			      Fd.Name().c_str());
+      return _error->Error(_("Unable to parse package file %s (1)"),
+	      Fd.Name().c_str());
    }
    Start += Tag.size();
    iOffset += Tag.size();
@@ -80,50 +79,6 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
    return true;
 }
 									/*}}}*/
-// TagFile::Fill - Top up the buffer					/*{{{*/
-// ---------------------------------------------------------------------
-/* This takes the bit at the end of the buffer and puts it at the start
-   then fills the rest from the file */
-bool pkgTagFile::Fill()
-{
-   unsigned long EndSize = End - Start;
-   unsigned long Actual = 0;
-   
-   memmove(Buffer,Start,EndSize);
-   Start = Buffer;
-   End = Buffer + EndSize;
-   
-   if (Done == false)
-   {
-      // See if only a bit of the file is left
-      if (Fd.Read(End,Size - (End - Buffer),&Actual) == false)
-	 return false;
-      if (Actual != Size - (End - Buffer))
-	 Done = true;
-      End += Actual;
-   }
-   
-   if (Done == true)
-   {
-      if (EndSize <= 3 && Actual == 0)
-	 return false;
-      if (Size - (End - Buffer) < 4)
-	 return true;
-      
-      // Append a double new line if one does not exist
-      unsigned int LineCount = 0;
-      for (const char *E = End - 1; E - End < 6 && (*E == '\n' || *E == '\r'); E--)
-	 if (*E == '\n')
-	    LineCount++;
-      for (; LineCount < 2; LineCount++)
-	 *End++ = '\n';
-      
-      return true;
-   }
-   
-   return true;
-}
-									/*}}}*/
 // TagFile::Jump - Jump to a pre-recorded location in the file		/*{{{*/
 // ---------------------------------------------------------------------
 /* This jumps to a pre-recorded file location and reads the record
@@ -141,22 +96,10 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
 
    // Reposition and reload..
    iOffset = Offset;
-   Done = false;
-   if (Fd.Seek(Offset) == false)
-      return false;
-   End = Start = Buffer;
-   
-   if (Fill() == false)
-      return false;
-
-   if (Tag.Scan(Start,End - Start) == true)
-      return true;
-   
-   // This appends a double new line (for the real eof handling)
-   if (Fill() == false)
-      return false;
+   Start = Buffer + iOffset;
    
-   if (Tag.Scan(Start,End - Start) == false)
+   // Start != End is a special case to not fail on empty TagFiles
+   if (Start != End && Tag.Scan(Start,End - Start) == false)
       return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str());
    
    return true;
@@ -181,7 +124,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
    Stop = Section = Start;
    memset(AlphaIndexes,0,sizeof(AlphaIndexes));
 
-   if (Stop == 0)
+   if (Stop == 0 || MaxLength == 0)
       return false;
    
    TagCount = 0;
@@ -212,6 +155,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
       Stop++;
    }
 
+   if ((Stop+1 >= End) && (End[-1] == '\n' || End[-1] == '\r'))
+   {
+       Indexes[TagCount] = (End - 1) - Section;
+       return true;
+   }
+
    return false;
 }
 									/*}}}*/
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 8c948754d..5cff2681c 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -25,6 +25,7 @@
 #endif 
 
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/mmap.h>
 #include <stdio.h>
     
 class pkgTagSection
@@ -69,15 +70,13 @@ class pkgTagSection
 class pkgTagFile
 {
    FileFd &Fd;
+   MMap *Map;
    char *Buffer;
    char *Start;
    char *End;
-   bool Done;
    unsigned long iOffset;
    unsigned long Size;
    
-   bool Fill();
-   
    public:
 
    bool Step(pkgTagSection &Section);
diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index c3d08d9d4..a171522d5 100644
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -174,11 +174,12 @@ ifeq ($(NUM_PROCS),1)
   PARALLEL_RUN=no
 endif
 
-ifndef PARALLEL_RUN
- PARALLEL_RUN=yes
- .EXPORT: PARALLEL_RUN
- # handle recursion
- ifneq ($(NUM_PROCS),)
-  MAKEFLAGS += -j $(NUM_PROCS)
- endif
-endif
+# mvo: commented out, lead to build failures in the arch-build target
+#ifndef PARALLEL_RUN
+# PARALLEL_RUN=yes
+# .EXPORT: PARALLEL_RUN
+# # handle recursion
+# ifneq ($(NUM_PROCS),)
+#  MAKEFLAGS += -j $(NUM_PROCS)
+# endif
+#endif
diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak
index e1ae0c805..511a5cae2 100644
--- a/buildlib/podomain.mak
+++ b/buildlib/podomain.mak
@@ -14,7 +14,7 @@ MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN)
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE))
 $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile
 	(echo $(SRC) | xargs -n1 echo) > $@
-binary program: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
+binary program clean: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
 
 veryclean: veryclean/$(LOCAL)
 veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 0014563b8..aea9ebeba 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1574,10 +1574,11 @@ bool Madison(CommandLine &CmdL)
 
    pkgCache &Cache = *GCache;
 
-   // Create the text record parsers
+   // Create the src text record parsers and ignore errors about missing
+   // deb-src lines that are generated from pkgSrcRecords::pkgSrcRecords
    pkgSrcRecords SrcRecs(*SrcList);
    if (_error->PendingError() == true)
-      return false;
+      _error->Discard();
 
    for (const char **I = CmdL.FileList + 1; *I != 0; I++)
    {
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 54c464a37..30d046447 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>
@@ -1367,7 +1369,7 @@ bool DoUpdate(CommandLine &CmdL)
    }
    
    // Clean out any old list files
-   if (_config->FindB("APT::Get::List-Cleanup",true) == true)
+   if (!Failed && _config->FindB("APT::Get::List-Cleanup",true) == true)
    {
       if (Fetcher.Clean(_config->FindDir("Dir::State::lists")) == false ||
 	  Fetcher.Clean(_config->FindDir("Dir::State::lists") + "partial/") == false)
@@ -1456,15 +1458,6 @@ bool DoUpgrade(CommandLine &CmdL)
 /* Install named packages */
 bool DoInstall(CommandLine &CmdL)
 {
-   // Lock the list directory
-   FileFd Lock;
-   if (_config->FindB("Debug::NoLocking",false) == false)
-   {
-      Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
-      if (_error->PendingError() == true)
-        return _error->Error(_("Unable to lock the list directory"));
-   }
-   
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || 
        Cache.CheckDeps(CmdL.FileSize() != 1) == false)
@@ -1956,6 +1949,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++)
@@ -1992,7 +1988,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/cmdline/apt-key b/cmdline/apt-key
index 0685e36f7..7460a24be 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -16,7 +16,7 @@ REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
 	echo >&2 "ERROR: Can't find the archive-keyring"
-	echo >&2 "Is the debian-keyring package installed?"
+	echo >&2 "Is the debian-archive-keyring package installed?"
 	exit 1
     fi
 
diff --git a/configure.in b/configure.in
index 18cdbfdde..6d42f340e 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.43")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1-0.1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
@@ -192,7 +192,7 @@ ah_GCC3DEP
 dnl It used to be that the user could select translations and that could get
 dnl passed to the makefiles, but now that can only work if you use special
 dnl gettext approved makefiles, so this feature is unsupported by this.
-ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
+ALL_LINGUAS="bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW"
 AM_GNU_GETTEXT(external)
 if test x"$USE_NLS" = "xyes"; then
    AC_DEFINE(USE_NLS)
diff --git a/debian/apt.dirs b/debian/apt.dirs
index d39bfd1f7..e1cb738fa 100644
--- a/debian/apt.dirs
+++ b/debian/apt.dirs
@@ -2,6 +2,7 @@ usr/bin
 usr/lib/apt/methods
 usr/lib/dpkg/methods/apt
 etc/apt
+etc/apt/sources.list.d
 var/cache/apt/archives/partial
 var/lib/apt/lists/partial
 var/lib/apt/periodic
diff --git a/debian/changelog b/debian/changelog
index ed893114b..8b11ff0da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,145 @@
+apt (0.6.44.2) unstable; urgency=low
+
+  * apt-pkg/depcache.cc:
+    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
+  * merged from 
+    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+  	* sk.po: Completed to 512t
+	* eu.po: Completed to 512t
+	* fr.po: Completed to 512t
+	* sv.po: Completed to 512t
+	* Update all PO and the POT. Gives 506t6f for formerly
+	  complete translations
+
+ --
+
+apt (0.6.44.1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Don't give an error when parsing empty Packages/Sources files.
+    (Closes: #366931, #367086, #370160)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+
+apt (0.6.44.1) unstable; urgency=low
+
+  * merged from 
+    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+    - po/LINGUAS: added "bg" Closes: #360262
+    - po/gl.po: Galician translation update. Closes: #366849
+    - po/hu.po: Hungarian translation update. Closes: #365448
+    - po/cs.po: Czech translation updated. Closes: #367244
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 16 May 2006 21:51:16 +0200
+
+apt (0.6.44) unstable; urgency=low
+
+  * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large
+  * apt-pkg/deb/dpkgpm.cc: 
+    - wording fixes (thanks to Matt Zimmerman)
+    - fix error in dpkg interaction (closes: #364513, 
+      thanks to Martin Dickopp)
+  * apt-pkg/tagfile.{cc,h}:
+    - use MMap to read the entries (thanks to Zephaniah E. Hull for the
+      patch) Closes: #350025
+  * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
+  	* bg.po: Added, complete to 512t. Closes: #360262
+  * doc/apt-ftparchive.1.xml:
+    - fix documentation for "SrcPackages" -> "Sources" 
+      (thanks to Bart Martens for the patch, closes: #307756)
+  * debian/libapt-pkg-doc.doc-base.cache:
+    - remove broken charackter from description (closes: #361129)
+  * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: 
+    - i18n fixes (closes: #349298)
+  * debian/postinst: dont fail on not available
+    /usr/share/doc/apt/examples/sources.list (closes: #361130)
+  * methods/ftp.cc:
+    - unlink empty file in partial if the download failed because
+      the file is missing on the server (closes: #316337)
+  * apt-pkg/deb/debversion.cc:
+    - treats a version string with explicit zero epoch equal
+      than the same without epoch (Policy 5.6.12, closes: #363358)
+      Thanks to Lionel Elie Mamane for the patch
+  
+ -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:28:53 +0200
+
+apt (0.6.43.3) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
+    * ca.po: Completed to 512t. Closes: #351592
+    * eu.po: Completed to 512t. Closes: #350483
+    * ja.po: Completed to 512t. Closes: #349806
+    * pl.po: Completed to 512t. Closes: #349514
+    * sk.po: Completed to 512t. Closes: #349474
+    * gl.po: Completed to 512 strings Closes: #349407
+    * sv.po: Completed to 512 strings Closes: #349210
+    * ru.po: Completed to 512 strings Closes: #349154
+    * da.po: Completed to 512 strings Closes: #349084
+    * fr.po: Completed to 512 strings
+    * vi.po: Completed to 511 strings  Closes: #348968
+    * zh_CN.po: Completed to 512t. Closes: #353936
+    * it.po: Completed to 512t. Closes: #352803
+    * pt_BR.po: Completed to 512t. Closes: #352419
+    * LINGUAS: Add Welsh
+    * *.po: Updated from sources (512 strings)
+  * apt-pkg/deb/deblistparser.cc:
+    - don't explode on a DepCompareOp in a Provides line, but warn about
+      it and ignore it otherwise (thanks to James Troup for reporting it)
+  * cmdline/apt-get.cc:
+    - don't lock the lists directory in DoInstall, breaks --print-uri 
+      (thanks to James Troup for reporting it)
+  * debian/apt.dirs: create /etc/apt/sources.list.d 
+  * make apt-cache madison work without deb-src entries (#352583)
+  * cmdline/apt-get.cc: only run the list-cleaner if a update was 
+    successfull
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:13:04 +0100
+
+apt (0.6.43.2) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
+    - en_GB.po, de.po: fix spaces errors in "Ign " translations Closes: #347258
+    - makefile: make update-po a pre-requisite of clean target so
+    	        that POT and PO files are always up-to-date
+    - sv.po: Completed to 511t. Closes: #346450
+    - sk.po: Completed to 511t. Closes: #346369
+    - fr.po: Completed to 511t
+    - *.po: Updated from sources (511 strings)
+    - el.po: Completed to 511 strings Closes: #344642
+    - da.po: Completed to 511 strings Closes: #348574
+    - es.po: Updated to 510t1f Closes: #348158
+    - gl.po: Completed to 511 strings Closes: #347729
+    - it.po: Yet another update Closes: #347435
+  * added debian-archive-keyring to the Recommends (closes: #347970)
+  * fixed message in apt-key to install debian-archive-keyring 
+  * typos fixed in apt-cache.8 (closes: #348348, #347349)
+  * add patch to fix http download corruption problem (thanks to
+    Petr Vandrovec, closes: #280844, #290694)
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 19 Jan 2006 00:06:33 +0100
+
 apt (0.6.43.1) unstable; urgency=low
 
-  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-133:
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
     * fr.po: Completed to 510 strings
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Nov 2005 10:14:02 +0100
+    * 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
 
diff --git a/debian/compat b/debian/compat
index 00750edc0..7ed6ff82d 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-3
+5
diff --git a/debian/control b/debian/control
index 5c76a90eb..53ce851f6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
 Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.1.62), libdb4.3-dev, gettext (>= 0.12)
+Standards-Version: 3.6.2.2
+Build-Depends: debhelper (>= 5.0), libdb4.3-dev, gettext (>= 0.12)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
 
 Package: apt
@@ -13,6 +13,7 @@ Depends: ${shlibs:Depends}
 Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
+Recommends: debian-archive-keyring
 Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
 Section: admin
 Description: Advanced front-end for dpkg
diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache
index b58b79bd1..59558dee8 100644
--- a/debian/libapt-pkg-doc.doc-base.cache
+++ b/debian/libapt-pkg-doc.doc-base.cache
@@ -4,7 +4,7 @@ Author: Jason Gunthorpe
 Abstract: The APT Cache Specification describes the complete implementation
  and format of the APT Cache file. The APT Cache file is a way for APT to
  parse and store a large number of package files for display in the UI.
- It's primary�design goal is to make display of a single package in the
+ It's primary design goal is to make display of a single package in the
  tree very fast by pre-linking important things like dependencies and
  provides. The specification doubles as documentation for one of the
  in-memory structures used by the package library and the APT GUI.
diff --git a/debian/postinst b/debian/postinst
index 891792111..1588f5241 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -12,7 +12,10 @@ set -e
 
 create_apt_conf ()
 {
- cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list
+ EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list
+ if [ -f $EXAMPLE_SOURCE ]; then
+     cp $EXAMPLE_SOURCE /etc/apt/sources.list
+ fi
 }
  
 check_apt_conf ()
diff --git a/debian/rules b/debian/rules
index 94e3e2216..044f742d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ endif
 # Default rule
 build:
 
+PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
@@ -335,6 +336,6 @@ cvs-mkul:
 arch-build:
 	rm -rf debian/arch-build
 	mkdir -p debian/arch-build/apt-$(APT_DEBVER)
-	baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER)
+	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -)
 	$(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc
 	(cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes)
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 0e1d2f8d9..789c3d228 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -191,7 +191,7 @@ Reverse Provides:
 
      <varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
      <listitem><para><literal>show</literal> performs a function similar to 
-     <command>dpkg --print-avail</command>i; it displays the package records for the 
+     <command>dpkg --print-avail</command>; it displays the package records for the 
      named packages.</para></listitem>
      </varlistentry>
 
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 7c1ae9432..8cfbc72e9 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -407,10 +407,10 @@ for i in Sections do
       Sets the Packages file output.</para></listitem>
       </varlistentry>
       
-      <varlistentry><term>SrcPackages</term>
+      <varlistentry><term>Sources</term>
       <listitem><para>
       Sets the Sources file output. At least one of
-      <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+      <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem>
       </varlistentry>
       
       <varlistentry><term>Contents</term>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index e22446030..fa13ddc0f 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -120,7 +120,7 @@
  
        <listitem><para><literal>Mirror network compromise</literal>.
         Without signature checking, a malicious agent can compromise a
-        mirror host and modify the files in it to propage malicious
+        mirror host and modify the files in it to propagate malicious
         software to all users downloading packages from that
         host.</para></listitem>
     </itemizedlist>
diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf
index 657ec5440..c9d352ab6 100644
--- a/doc/examples/apt-ftparchive.conf
+++ b/doc/examples/apt-ftparchive.conf
@@ -20,21 +20,21 @@ Default {
 // Contents file for these in the main section of the sid release
 BinDirectory "pool/main" {
 	Packages "dists/sid/main/binary-i386/Packages";
-	SrcPackages "dists/sid/main/source/Sources";
+	Sources "dists/sid/main/source/Sources";
 	Contents "dists/sid/Contents-i386";
 }
 
 // This is the same for the contrib section
 BinDirectory "pool/contrib" {
 	Packages "dists/sid/contrib/binary-i386/Packages";
-	SrcPackages "dists/sid/contrib/source/Sources";
+	Sources "dists/sid/contrib/source/Sources";
 	Contents "dists/sid/Contents-i386";
 }
 
 // This is the same for the non-free section
 BinDirectory "pool/non-free" {
 	Packages "dists/sid/non-free/binary-i386/Packages";
-	SrcPackages "dists/sid/non-free/source/Sources";
+	Sources "dists/sid/non-free/source/Sources";
 	Contents "dists/sid/Contents-i386";
 };
 
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 8a68e2892..d9e78559d 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -248,6 +248,7 @@ DPkg
 Debug 
 {
   pkgProblemResolver "false";
+  pkgDepCache::AutoInstall "false"; // what packages apt install to satify dependencies
   pkgAcquire "false";
   pkgAcquire::Worker "false";
   pkgDPkgPM "false";
diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml
index 61cdfa2ec..9ae6506fc 100644
--- a/doc/fr/apt-ftparchive.fr.1.xml
+++ b/doc/fr/apt-ftparchive.fr.1.xml
@@ -451,10 +451,10 @@ Indique le fichier �&nbsp;Packages&nbsp;� cr��.
       </para></listitem>
 </varlistentry>
 
-<varlistentry><term>SrcPackages</term>
+<varlistentry><term>Sources</term>
 <listitem><para>
 Indique le fichier �&nbsp;Sources&nbsp;� cr��. L'un des deux fichiers, 
-<literal>Packages</literal> ou <literal>SrcPackages</literal> est n�cessaire.
+<literal>Packages</literal> ou <literal>Sources</literal> est n�cessaire.
       </para></listitem>
 </varlistentry>
 
@@ -628,4 +628,4 @@ d�cimal 100 en cas d'erreur.
 &manbugs;
 &traducteur;
 
-</refentry>
-\ No newline at end of file
+</refentry>
diff --git a/doc/fr/apt-get.fr.8.xml b/doc/fr/apt-get.fr.8.xml
index 8832dd22e..cfaa76c7d 100644
--- a/doc/fr/apt-get.fr.8.xml
+++ b/doc/fr/apt-get.fr.8.xml
@@ -571,6 +571,11 @@ le guide APT.
 </para>
  </refsect1>
 
+ <refsect1><title>Diagnostic</title>
+   <para><command>apt-get</command> renvoie z�ro apr�s une op�ration normale, le d�cimal 100
+en cas d'erreur.</para>
+ </refsect1>
+
  &manbugs;
 &deux-traducteurs;
 </refentry>
diff --git a/doc/fr/apt-key.fr.8.xml b/doc/fr/apt-key.fr.8.xml
index 29ba237e2..73a61ea41 100644
--- a/doc/fr/apt-key.fr.8.xml
+++ b/doc/fr/apt-key.fr.8.xml
@@ -18,7 +18,7 @@
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-key</refname>
-    <refpurpose>APT key management utility</refpurpose>
+    <refpurpose>Utilitaire de gestion des cl�s</refpurpose>
  </refnamediv>
 
  <!-- Arguments -->
@@ -103,7 +103,7 @@ Debian et supprimer les cl�s qui sont p�rim�es.
 
      <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>
 </term>
-    <listitem><para>>Trousseau des cl�s fiables supprim�es de l'archive Debian.</para></listitem>
+    <listitem><para>Trousseau des cl�s fiables supprim�es de l'archive Debian.</para></listitem>
      </varlistentry>
 
    </variablelist>
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index 81130d9ef..d705b9e3e 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -11,36 +11,38 @@
 <!ENTITY apt-conf "<citerefentry>
     <refentrytitle><filename>apt.conf</filename></refentrytitle>
     <manvolnum>5</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-get "<citerefentry>
     <refentrytitle><command>apt-get</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-config "<citerefentry>
     <refentrytitle><command>apt-config</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>">
+  </citerefentry>"
+>
 
 <!ENTITY apt-cdrom "<citerefentry>
     <refentrytitle><command>apt-cdrom</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-cache "<citerefentry>
     <refentrytitle><command>apt-cache</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY apt-preferences "<citerefentry>
     <refentrytitle><command>apt_preferences</command></refentrytitle>
     <manvolnum>5</manvolnum>
-  </citerefentry>">
+  </citerefentry>"
+>
 
 <!ENTITY apt-key "<citerefentry>
     <refentrytitle><command>apt-key</command></refentrytitle>
@@ -69,43 +71,44 @@
 <!ENTITY reportbug "<citerefentry>
     <refentrytitle><command>reportbug</command></refentrytitle>
     <manvolnum>1</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg "<citerefentry>
     <refentrytitle><command>dpkg</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg-buildpackage "<citerefentry>
     <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
     <manvolnum>1</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY gzip "<citerefentry>
     <refentrytitle><command>gzip</command></refentrytitle>
     <manvolnum>1</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg-scanpackages "<citerefentry>
     <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dpkg-scansources "<citerefentry>
     <refentrytitle><command>dpkg-scansources</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>
-">
+  </citerefentry>"
+>
 
 <!ENTITY dselect "<citerefentry>
     <refentrytitle><command>dselect</command></refentrytitle>
     <manvolnum>8</manvolnum>
-  </citerefentry>">
+  </citerefentry>"
+>
     
 <!ENTITY aptitude "<citerefentry>
     <refentrytitle><command>aptitude</command></refentrytitle>
@@ -188,12 +191,12 @@
 <!ENTITY manbugs "
  <refsect1><title>Bogues</title>
    <para>
-Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues de APT</ulink>.  
-   Si vous voulez rapporter un bogue, consultez le texte 
+Voyez la <ulink url='http://bugs.debian.org/src:apt'> page concernant les bogues d'APT</ulink>.  
+   Si vous voulez signaler un bogue, consultez le texte 
    <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utilisez la 
 commande &reportbug;.</para>
- </refsect1>
- ">
+ </refsect1>"
+>
 
 <!-- Boiler plate Author section -->
 <!ENTITY manauthor "
@@ -201,17 +204,17 @@ commande &reportbug;.</para>
    <para>
    APT a �t� �crit par l'�quipe APT <email>apt@packages.debian.org</email>.
 </para>
- </refsect1>
-">
+ </refsect1>"
+>
 
 <!-- Section traduction -->
 <!ENTITY deux-traducteurs "
 <refsect1><title>Traduction</title>
 <para>
 J�r�me Marant. 2000&nbsp;; mise � jour : Philippe Batailler. 2005.
-</para>
-</refsect1>
-">
+<email>debian-l10n-french@lists.debian.org</email>.</para>
+</refsect1>"
+>
 
 <!ENTITY traducteur "
 <refsect1><title>Traduction</title>
diff --git a/doc/fr/sources.list.fr.5.xml b/doc/fr/sources.list.fr.5.xml
index 4abd9c95e..4235480f8 100644
--- a/doc/fr/sources.list.fr.5.xml
+++ b/doc/fr/sources.list.fr.5.xml
@@ -25,16 +25,15 @@
 
 <refnamediv>
 <refname>sources.list</refname>
-<refpurpose>Une liste, utilis�e par APT, indiquant les ressources de paquets</refpurpose>
+<refpurpose>Liste des sources de paquets</refpurpose>
 </refnamediv>
 
 <refsect1><title>Description</title>
 <para>   
-La liste des ressources de paquets indique o� trouver les archives
+La liste des sources de paquets indique o� trouver les archives
 du syst�me de distribution de paquets utilis�. Pour l'instant, cette page 
 de manuel ne documente que le syst�me d'empaquetage utilis� par le syst�me 
-Debian GNU/Linux. Ce fichier de contr�le est situ� dans 
-<filename>/etc/apt/sources.list</filename>.
+Debian GNU/Linux. Ce fichier de contr�le est <filename>/etc/apt/sources.list</filename>.
    </para>
 <para>
 La liste des sources est con�ue pour prendre en compte un nombre quelconque
@@ -49,17 +48,26 @@ ligne peut �tre un commentaire commen�ant par un caract�re #.
  </para>
 </refsect1>
 
+<refsect1><title>sources.list.d</title>
+<para> Le r�pertoire <filename>/etc/apt/sources.list.d</filename> permet de
+lister des sources de paquets dans des fichiers distincts qui se terminent
+par <literal>.list</literal>. Leur format est le m�me que celui du fichier
+<filename>sources.list</filename>. 
+</para>
+  </refsect1>
+
 <refsect1><title>Les types deb et deb-src.</title>
 <para>   
 Le type <literal>deb</literal> d�crit une archive Debian classique � deux niveaux,
 <filename>distribution/composant</filename>. <literal>distribution</literal> peut prendre
 l'une des valeurs suivantes&nbsp;: <literal>stable</literal>, <literal>unstable</literal>, ou 
-<literal>testing</literal>, et composant&nbsp;: <literal>main</literal>, <literal>contrib</literal>, 
-<literal>non-free</literal>, ou <literal>non-us</literal>. Le type <literal>deb-src</literal> 
-d�crit le
+<literal>testing</literal>, et composant&nbsp;: <literal>main</literal>, 
+<literal>contrib</literal>, 
+<literal>non-free</literal>, ou <literal>non-us</literal>. 
+Le type <literal>deb-src</literal> d�crit le
 code source pour une distribution Debian dans le m�me format que le type
 <literal>deb</literal>. Une ligne <literal>deb-src</literal> est n�cessaire pour r�cup�rer les
-index de sources.
+index des sources.
 </para>
 <para>
 Le format d'une entr�e dans <filename>sources.list</filename> utilisant les types 
@@ -73,7 +81,7 @@ dans laquelle APT trouvera les informations dont il a besoin.
 doit omettre les composants et <literal>distribution</literal> doit se terminer par une
 barre oblique (/). C'est utile quand seule une sous-section particuli�re de
 l'archive d�crite par cet URI est int�ressante. Quand <literal>distribution</literal>
-n'indique pas un chemin exact, un <literal>component</literal> au moins doit �tre 
+n'indique pas un chemin exact, un <literal>composant</literal> au moins doit �tre 
 pr�sent.
    </para>
 <para>
@@ -101,8 +109,8 @@ efficacement parti des sites � faible bande passante.
 <para>
 Il est important d'indiquer les sources par ordre de pr�f�rence,
 la source principale apparaissant en premier. Un tri est fait, de la plus
-rapide � la plus lente&nbsp;; par exemple, CD-ROM suivi par les h�tes d'un 
-r�seau local, puis les h�tes Internet distants.
+rapide � la plus lente&nbsp;; par exemple, un c�d�rom suivi par les h�tes d'un 
+r�seau local, puis les h�tes distants.
    </para>
 <para>Voici quelques exemples&nbsp;:
 </para>
@@ -127,9 +135,9 @@ montages NFS, les miroirs et les archives locaux.
 
 <varlistentry><term>cdrom</term>
 <listitem><para>
-Le proc�d� <literal>cdrom</literal> permet l'utilisation d'un lecteur de CDROM local 
+Le proc�d� <literal>cdrom</literal> permet l'utilisation d'un lecteur de c�d�rom 
 avec la possibilit� de changer de media. Utilisez le programme &apt-cdrom; 
-pour cr�er des entr�es dans la liste de sources.
+pour cr�er des entr�es dans la liste des sources.
 </para>
 </listitem>
 </varlistentry>
@@ -149,8 +157,8 @@ m�thode d'authentification peu s�re.
 <varlistentry><term>ftp</term>
 <listitem><para>
 Le proc�d� <literal>ftp</literal> indique un serveur FTP comme archive. Le 
-fonctionnement en mode ftp est grandement configurable&nbsp;; r�f�rez-vous 
-� la page de manuel de &apt-cdrom; pour davantage de renseignements. On 
+fonctionnement en mode ftp est largement configurable&nbsp;; r�f�rez-vous 
+� la page de manuel de &apt-cdrom; pour d'autres informations. On 
 remarquera qu'on peut indiquer un mandataire ftp avec la variable 
 d'environnement <envar>ftp_proxy</envar>. On peut aussi sp�cifier un mandataire http 
 (les serveurs mandataires http comprennent souvent les URL ftp) en utilisant 
diff --git a/doc/ja/apt-cache.ja.8.sgml b/doc/ja/apt-cache.ja.8.sgml
deleted file mode 100644
index 020137021..000000000
--- a/doc/ja/apt-cache.ja.8.sgml
+++ /dev/null
@@ -1,638 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.10 -->
-<!-- Bug#175611 is fixed in translation -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-cache</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-cache</>
-<!--    <refpurpose>APT package handling utility - - cache manipulator</> -->
-    <refpurpose>APT �ѥå��������桼�ƥ���ƥ� -- ����å������</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-cache</>
-      <arg><option>-hvsn</></arg>
-      <arg><option>-o=<replaceable/config string/</></arg>
-      <arg><option>-c=<replaceable/file/</></arg>
-      <group choice=req>
-         <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
-         <arg>gencaches</>
-         <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>stats</>
-         <arg>dump</>
-         <arg>dumpavail</>
-         <arg>unmet</>
-         <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
-         <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-<!--
-Bug#175611
-         <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg> -->
-         <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
-         <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
-<!-- <RefSect1><Title>Description</>-->
- <RefSect1><Title>����</>
-   <para>
-<!--
-   <command/apt-cache/ performs a variety of operations on APT's package 
-   cache. <command/apt-cache/ does not manipulate the state of the system 
-   but does provide operations to search and generate interesting output 
-   from the package metadata.
--->
-   <command/apt-cache/ �� APT �Υѥå���������å�����Ф��Ƥ�������������Ԥ��ޤ���
-   <command/apt-cache/ �ϡ������ƥ���֤����ϹԤ��ޤ��󤬡�
-   �ѥå������Υ᥿�ǡ�����긡�������ꡢ��̣�������Ϥ���������Ȥ��ä�����
-   �󶡤��ޤ���
-   <para>
-<!--
-   Unless the <option/-h/, or <option/-/-help/ option is given one of the
-   commands below must be present.
--->
-   <option/-h/ �� <option/--help/ ��������ʲ��˵󤲤륳�ޥ�ɤ�ɬ�פǤ���
-   <VariableList>
-     <VarListEntry><Term>add</Term>
-     <ListItem><Para>
-<!--
-     <literal/add/ adds the named package index files to the package cache.
-     This is for debugging only.
--->
-     <literal/add/ �ϥѥå���������å���ˡ����ꤷ���ѥå���������ǥå���
-     �ե�������ɲä��ޤ����ǥХå����ѤǤ���
-     </VarListEntry>
-     
-     <VarListEntry><Term>gencaches</Term>
-     <ListItem><Para>
-<!--
-     <literal/gencaches/ performs the same opration as 
-     <command/apt-get check/. It builds the source and package caches from 
-     the sources in &sources-list; and from <filename>/var/lib/dpkg/status</>.
--->
-     <literal/gencaches/ �� <command/apt-get check/ ��Ʊ��ư����󶡤��ޤ���
-     ����� &sources-list; ��μ������� <filename>/var/lib/dpkg/status</> 
-     ���顢�������ȥѥå������Υ���å�����ۤ��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>showpkg</Term>
-     <ListItem><Para>
-<!--
-     <literal/showpkg/ displays information about the packages listed on the 
-     command line. Remaining arguments are package names. The available 
-     versions and reverse dependencies of each package listed are listed, as 
-     well as forward dependencies for each version. Forward (normal) 
-     dependencies are those packages upon which the package in question 
-     depends; reverse dependencies are those packages that depend upon the 
-     package in question. Thus, forward dependencies must be satisfied for a 
-     package, but reverse dependencies need not be.
-     For instance, <command>apt-cache showpkg libreadline2</> would produce 
-     output similar to the following:
--->
-     <literal/showpkg/ �ϡ����ޥ�ɥ饤������󤷤��ѥå������ξ����
-     ɽ�����ޤ����Ĥ�ΰ����ϥѥå�����̾�Ǥ���
-     ��󤷤��ѥå������ˤĤ��ơ��ƥС������ΰ�¸�ط���ɽ������褦�� ��
-     ͭ���ʥС����������¸�ط�����󤷤ޤ���
-     (��)��¸�ط��Ȥϡ��оݤΥѥå���������¸���Ƥ���ѥå������򤵤��ޤ���
-     �ޤ������¸�ط��Ȥϡ��оݤΥѥå������˰�¸���Ƥ���ѥå������򤵤��ޤ���
-     ���äơ��ѥå������ΰ�¸�ط����������ʤ���Фʤ�ޤ��󤬡�
-     ���¸�ط��Ϥ���ɬ�פϤ���ޤ���
-     ����Ȥ��ơ��ʲ��� <command>apt-cache showpkg libreadline2</> ��
-     ���Ϥ�Ǥ��ޤ���
-
-<informalexample><programlisting>
-Package: libreadline2
-Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
-Reverse Depends: 
-  libreadlineg2,libreadline2
-  libreadline2-altdev,libreadline2
-Dependencies:
-2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
-Provides:
-2.1-12 - 
-Reverse Provides: 
-</programlisting></informalexample>
-			    
-     <para>
-<!--     Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and
-     ncurses3.0 which must be installed for libreadline2 to work. 
-     In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If
-     libreadline2 is installed, libc5, ncurses3.0, and ldso must also be
-     installed; libreadlineg2 and libreadline2-altdev do not have to be
-     installed. For the specific meaning of the remainder of the output it
-     is best to consult the apt source code.
--->
-     �Ĥޤꡢlibreadline2 �� version 2.1-12 �� libc5 �� ncurses3.0 �˰�¸����
-     ���ơ�libreadline2 ��ư���ˤϤ����򥤥󥹥ȡ��뤹��ɬ�פ������
-     �������Ȥ�Ƚ��ޤ���
-     ������libreadlineg2 �� libreadline2-altdev �� libreadline2 �˰�¸���Ƥ��ޤ���
-     libreadline2 �򥤥󥹥ȡ��뤹�뤿��ˤϡ�libc5, ncurses3.0, ldso ��
-     ���٤ƥ��󥹥ȡ��뤷�ʤ���Фʤ�ޤ��󤬡�libreadlineg2 �� 
-     libreadline2-altdev �ϥ��󥹥ȡ��뤹��ɬ�פϤ���ޤ���
-     ���ϤλĤ����ʬ�ΰ�̣�ˤĤ��Ƥϡ�apt �Υ����������ɤ�Ĵ�٤�Τ����ɤǤ��礦��
-     </VarListEntry>
-
-     <VarListEntry><Term>stats</Term>
-     <ListItem><Para>
-<!--
-     <literal/stats/ displays some statistics about the cache.
-     No further arguments are expected. Statistics reported are:
--->
-     <literal/stats/ �ϥ���å���ˤĤ��Ƥ����׾����ɽ�����ޤ���
-     ����ʾ塢������ɬ�פ���ޤ��󡣰ʲ������׾����ɽ�����ޤ���
-     <itemizedlist>
-<!--
-�ʲ� stats �Υ�ƥ��ˤĤ��Ƥϡ�ɽ����������̾ (������ʸ) �Ȥ���������
-���Ҥ��ޤ���(ɽ���������ܤ���������Υ��ʤ��褦��)
-�ǽ�Ū�˥�å�������������������˽��������ɬ�פ�����ޤ���(��߷)
--->
-       <listitem><para>
-<!--
-       <literal/Total package names/ is the number of package names found 
-       in the cache.
--->
-       <literal/Total package names (���ѥå�������)/ �ϡ�
-       ����å����¸�ߤ���ѥå���������ɽ���ޤ���
-       </listitem>
-       
-       <listitem><para>
-<!--
-       <literal/Normal packages/ is the number of regular, ordinary package 
-       names; these are packages that bear a one-to-one correspondence between 
-       their names and the names used by other packages for them in 
-       dependencies. The majority of packages fall into this category.
--->
-       <literal/Normal packages (�̾�ѥå�����)/ �ϡ�
-       ���������̤Υѥå���������ɽ���ޤ���
-       ����ϡ�¾�Υѥå������ΰ�¸�ط��ǻ��Ѥ��줿̾�Τǡ����줬���а���б�
-       ����ѥå������Ǥ���
-       ��¿���Υѥå������Ϥ��Υ��ƥ��������ޤ���
-       </listitem>
-
-       <listitem><para>
-<!--
-       <literal/Pure virtual packages/ is the number of packages that exist 
-       only as a virtual package name; that is, packages only "provide" the 
-       virtual package name, and no package actually uses the name. For 
-       instance, "mail-transport-agent" in the Debian GNU/Linux system is a 
-       pure virtual package; several packages provide "mail-transport-agent", 
-       but there is no package named "mail-transport-agent".
--->
-       <literal/Pure virtual packages (�㲾�ۥѥå�����)/ �ϡ�
-       ���ۥѥå�����̾�Ȥ��ƤΤ�¸�ߤ���
-       �ѥå����� (���ۥѥå�����̾�Τߤ���󶡡פ����ºݤˤϤ����ʤ�
-       �ѥå������⤽��̾�Τ�����ʤ�) �ο���ɽ���ޤ���
-       �㤨�С�Debian GNU/Linux �����ƥ�Ǥ� "mail-transport-agent" ��
-       �㲾�ۥѥå������Ǥ���"mail-transport-agent" ���󶡤���ѥå�������
-       �����Ĥ⤢��ޤ�����"mail-transport-agent" �Ȥ���̾�ΤΥѥå�������
-       ����ޤ���
-       </listitem>
-   
-       <listitem><para>
-<!--
-       <literal/Single virtual packages/ is the number of packages with only 
-       one package providing a particular virtual package. For example, in the
-       Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but 
-       only one package, xless, provides "X11-text-viewer".
--->
-       <literal/Single virtual packages (ñ���ۥѥå�����)/ �ϡ�
-       ����β��ۥѥå�����̾���󶡤���ѥå���������
-       ������Ĥξ��ο���ɽ���ޤ���
-       �㤨�С�Debian GNU/Linux �����ƥ�Ǥϡ�"X11-text-viewer" ��
-       ���ۥѥå������Ǥ�����"X11-text-viewer" ���󶡤���ѥå������ϡ�
-       xless �ѥå������ΤߤȤ������ȤǤ���
-       </listitem>
-
-       <listitem><para>
-<!--
-       <literal/Mixed virtual packages/ is the number of packages that either 
-       provide a particular virtual package or have the virtual package name 
-       as the package name. For instance, in the Debian GNU/Linux system, 
-       debconf is both an actual package, and provided by the debconf-tiny
-       package.
--->
-       <literal/Mixed virtual packages (ʣ���ۥѥå�����)/ �ϡ�
-       ���β��ۥѥå�����̾���󶡤���ѥå�������ʣ�����뤫��
-       �ޤ��ѥå�����̾��Ʊ�����ۥѥå�����̾����ĥѥå���������ɽ���ޤ���
-       �㤨�С�Debian GNU/Linux �����ƥ�Ǥϡ�debconf �ϼºݤΥѥå�����̾�Ǥ�
-       ����ޤ�����debconf-tiny �ˤ�ä��󶡤⤵��Ƥ��ޤ���
-       </listitem>
-   
-       <listitem><para>
-<!--
-       <literal/Missing/ is the number of package names that were referenced in
-       a dependency but were not provided by any package. Missing packages may 
-       be in evidence if a full distribution is not accesssed, or if a package
-       (real or virtual) has been dropped from the distribution. Usually they
-       are referenced from Conflicts statements.
--->
-       <literal/Missing (����)/ �ϡ���¸�ط���ˤ�¸�ߤ���Τˡ��ɤΥѥå�����
-       �ˤ��󶡤���Ƥ��ʤ��ѥå�����̾�ο���ɽ���ޤ���
-       �ѥå�����������Ȥ������Ȥϡ����ǥ����ȥ�ӥ塼�����˥���������
-       ���Ƥ��ʤ�����(�¤ʤ�������) �ѥå��������ǥ����ȥ�ӥ塼����󤫤�
-       �Ϥ�����Ƥ��ޤä����⤷��ʤ����Ȥ�ɽ���ޤ���
-       �̾����Ϲ�ʸ��̷�⤹�뤳�Ȥǻ��Ȥ���ޤ���
-       </listitem>
-
-       <listitem><para>
-<!--
-       <literal/Total distinct/ versions is the number of package versions 
-       found in the cache; this value is therefore at least equal to the 
-       number of total package names. If more than one distribution (both 
-       "stable" and "unstable", for instance), is being accessed, this value 
-       can be considerably larger than the number of total package names.
--->
-       <literal/Total distinct versions (���̥С�������)/ �ϥ���å����
-       ¸�ߤ���ѥå������ΥС������ο���ɽ���ޤ������Τ��ᡢ�����ͤ�
-       �Ǿ��Ǥ����ѥå������פȰ��פ��ޤ���
-       ���Ȥ��� 2 ����ʾ�Υǥ����ȥ�ӥ塼�����
-        ("stable" �� "unstable"��ξ���ʤ�) �����Ѥ�����硢
-       �����ͤϥѥå������פ��⤫�ʤ��礭�����ˤʤ�ޤ���
-       </listitem>
-
-       <listitem><para>
-<!--
-       <literal/Total dependencies/ is the number of dependency relationships 
-       claimed by all of the packages in the cache.
--->
-       <literal/Total dependencies (����¸�ط�)/ �ϥ���å�����Τ��٤Ƥ�
-       �ѥå��������׵ᤵ�줿��¸�ط��ο��Ǥ���
-       </listitem>
-     </itemizedlist>
-     </VarListEntry>
-     
-     <VarListEntry><Term>showsrc</Term>
-     <ListItem><Para>
-<!--
-     <literal/showsrc/ displays all the source package records that match
-     the given package names. All versions are shown, as well as all 
-     records that declare the name to be a Binary.
-     named packages.
--->
-     <literal/showsrc/ �ϻ��ꤷ���ѥå�����̾�Ȱ��פ��륽�����ѥå�������
-     ���٤�ɽ�����ޤ������ꤷ���ѥå������ˤĤ��ơ��Х��ʥ�ˤʤ�Ȥ���̾�Τ�
-     ��������쥳����Ʊ�ͤˡ����٤ƤΥС������ˤĤ���ɽ�����ޤ���
-     </VarListEntry>
-     
-     <VarListEntry><Term>dump</Term>
-     <ListItem><Para>
-<!--
-     <literal/dump/ shows a short listing of every package in the cache. It is 
-     primarily for debugging.
--->
-     <literal/dump/ �ϥ���å���ˤ���ѥå�������Ρ�û��������ɽ�����ޤ���
-     ��˥ǥХå��ѤǤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>dumpavail</Term>
-     <ListItem><Para>
-<!--
-     <literal/dumpavail/ prints out an available list to stdout. This is 
-     suitable for use with &dpkg; and is used by the &dselect; method.
--->
-     <literal/dumpavail/ ��ɸ����Ϥˡ����Ѳ�ǽ�ʤ�Τΰ�������Ϥ��ޤ���
-     &dpkg; �ȶ��˻��Ѥ���������Ǥ����ޤ� &dselect; �Ǥ���Ѥ���ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>unmet</Term>
-     <ListItem><Para>
-<!--
-     <literal/unmet/ displays a summary of all unmet dependencies in the 
-     package cache.
--->
-     <literal/unmet/ �ϥѥå���������å�����Ρ���Ŭ���ʰ�¸�ط��γ��פ�
-     ɽ�����ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>show</Term>
-     <ListItem><Para>
-<!--
-     <literal/show/ performs a function similar to 
-     <command>dpkg - -print-avail</>, it displays the package records for the 
-     named packages.
--->
-     <literal/show/ �� <command>dpkg --print-avail</> �˻�����ǽ��¹Ԥ��ޤ���
-     ���ꤷ���ѥå������Υѥå������쥳���ɤ�ɽ�����ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>search</Term>
-     <ListItem><Para>
-<!--
-     <literal/search/ performs a full text search on all available package 
-     files for the regex pattern given. It searchs the package names and the 
-     descriptions for an occurance of the string and prints out the package 
-     name and the short description. If <option/- -full/ is given then output 
-     identical to <literal/show/ is produced for each matched package and 
-     if <option/- -names-only/ is given then the long description is not 
-     searched, only the package name is.
--->
-     <literal/search/ ��Ϳ����줿����ɽ���ˤ�äơ����٤Ƥ����Ѳ�ǽ��
-     �ѥå��������Ф�����ʸ������Ԥ��ޤ����ѥå�����̾���������Ф��Ƹ�����
-     �Ԥ����ѥå�����̾��û������ʸ��ɽ�����ޤ���
-     <option/--full/ ��Ϳ����줿��硢�ޥå������ѥå��������Ф� 
-     <literal/show/ ��Ʊ���������Ϥ��ޤ���
-     <option/--names-only/ ��Ϳ����줿���ϡ�����ʸ���Ф��Ƹ�����Ԥ鷺��
-     �ѥå�����̾���Ф��ƤΤ��оݤȤ��ޤ���
-     <para>
-<!--
-     Seperate arguments can be used to specified multiple search patterns that 
-     are and'd together.
--->
-     ����Ƕ��ڤä�������ʣ���θ����ѥ������ and ��Ȥ뤳�Ȥ��Ǥ��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>depends</Term>
-     <ListItem><Para>
-<!--
-     <literal/depends/ shows a listing of each dependency a package has 
-     and all the possible other packages that can fullfill that dependency.
--->
-     <literal/depends/ �ϡ��ѥå����������äƤ����¸�ط��ȡ����ΰ�¸�ط���
-     ������¾�Υѥå������ΰ�����ɽ�����ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>pkgnames</Term>
-     <ListItem><Para>
-<!--
-     This command prints the name of each package in the system. The optional
-     argument is a prefix match to filter the name list. The output is suitable
-     for use in a shell tab complete function and the output is generated 
-     extremly quickly. This command is best used with the 
-     <option/- -generate/ option.
--->
-     ���Υ��ޥ�ɤϡ������ƥ�Ǥγƥѥå�������̾�Τ�ɽ�����ޤ���
-     ���ץ����ΰ����ˤ�ꡢ����������������Ƭ���פ���Ф��뤳�Ȥ��Ǥ��ޤ���
-     ���ν��Ϥϥ�����Υ��֤ˤ���䴰��ǽ�ǻȤ��䤹�����ޤ�����®����������ޤ���
-     ���Υ��ޥ�ɤ� <option/--generate/ ���ץ����ȶ��˻��Ѥ��������
-     �����Ǥ���
-     </VarListEntry>
-     <VarListEntry><Term>dotty</Term>
-     <ListItem><Para>
-<!--
-     <literal/dotty/ takes a list of packages on the command line and 
-     gernerates output suitable for use by dotty from the 
-     <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>
-     package. The result will be a set of nodes and edges representing the 
-     relationships between the packages. By default the given packages will 
-     trace out all dependent packages which can produce a very large graph. 
-     This can be turned off by setting the 
-     <literal>APT::Cache::GivenOnly</> option.
--->
-     <literal/dotty/ �ϡ����ޥ�ɥ饤���Υѥå�����̾���顢
-     <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</> 
-     �ѥå������� dotty ���ޥ�ɤ����Ѥ���Τ������ʽ��Ϥ��������ޤ���
-     ��̤ϥѥå������δط���ɽ�魯���Ρ��ɡ����å��Υ��åȤ�ɽ������ޤ���
-     �ǥե���ȤǤϡ����٤Ƥΰ�¸�ѥå�������ȥ졼������Τǡ������礭��
-     �ޤ������ޤ���
-     ����ϡ�<literal>APT::Cache::GivenOnly</> ���ץ���������ǲ������
-     ���Ȥ��Ǥ��ޤ���
-     <para>
-<!--
-     The resulting nodes will have several shapse, normal packages are boxes,
-     pure provides are triangles, mixed provides are diamonds, 
-     hexagons are missing packages. Orange boxes mean recursion was stopped 
-     [leaf packages], blue lines are prre-depends, green lines are conflicts.
--->
-     ��̤ΥΡ��ɤϿ�����η����Ȥʤ�ޤ���
-     �̾�ѥå������ϻͳѡ��㲾�ۥѥå������ϻ��ѡ�ʣ���ۥѥå�������ɩ����
-     ϻ�ѷ��Ϸ���ѥå������򤽤줾��ɽ���ޤ���
-     ����󥸤λͳѤϺƵ�����λ�����֥꡼�եѥå������ס��Ĥ����� pre-depends��
-     �Ф����϶����ɽ���ޤ���
-     <para>
-<!--
-     Caution, dotty cannot graph larger sets of packages.
--->
-     ����) dotty �ϥѥå������Τ���礭�ʥ��åȤΥ���դ������ޤ���     
-     <VarListEntry><Term>policy</Term>
-     <ListItem><Para>
-<!--
-     <literal/policy/ is ment to help debug issues relating to the 
-     preferences file. With no arguments it will print out the 
-     priorities of each source. Otherwise it prints out detailed information
-     about the priority selection of the named package.
--->
-     <literal/policy/ ������ե�����ط�������ˤĤ��ơ��ǥХå���ٱ礷�ޤ���
-     ��������ꤷ�ʤ��ä���硢���������Ȥ�ͥ���̤�ɽ�����ޤ���
-     �������ѥå�����̾����ꤷ����硢ͥ���ξܺپ����ɽ�����ޤ���
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
- 
-<!--
- <RefSect1><Title>Options</>
--->
- <RefSect1><Title>���ץ����</>
-   &apt-cmdblurb;
-   
-   <VariableList>
-     <VarListEntry><term><option/-p/</><term><option/--pkg-cache/</>
-     <ListItem><Para>
-<!--
-     Select the file to store the package cache. The package cache is the 
-     primary cache used by all operations.
-     Configuration Item: <literal/Dir::Cache::pkgcache/.
--->
-     �ѥå���������å�����Ǽ����ե���������򤷤ޤ���
-     �ѥå���������å���ϡ����٤Ƥ����ǻ��Ѥ����켡����å���Ǥ���
-     ������� - <literal/Dir::Cache::pkgcache/
-     </VarListEntry>
-
-     <VarListEntry><term><option/-s/</><term><option/--src-cache/</>
-     <ListItem><Para>
-<!--
-     Select the file to store the source cache. The source is used only by
-     <literal/gencaches/ and it stores a parsed version of the package 
-     information from remote sources. When building the package cache the 
-     source cache is used to advoid reparsing all of the package files.
-     Configuration Item: <literal/Dir::Cache::srcpkgcache/.
--->
-     ����������å�����Ǽ����ե���������򤷤ޤ���
-     ���Υ���������å���� <literal/gencaches/ �ǤΤ߻��Ѥ��졢
-     �����˲��Ϥ��줿�������Υѥå��������󤬳�Ǽ����Ƥ��ޤ���
-     �ѥå���������å�����ۤ���ݤˡ�����������å���ϡ�
-     ���ѥå������ե������Ʋ��Ϥ��򤱤��������Ǥ���
-     <!--advoid �� avoid �Υߥ����ڥ롩 -->
-     ������� - <literal/Dir::Cache::srcpkgcache/
-     </VarListEntry>
-
-     <VarListEntry><term><option/-q/</><term><option/--quiet/</>
-     <ListItem><Para>
-<!--
-     Quiet; produces output suitable for logging, omitting progress indicators.
-     More qs will produce more quite up to a maximum of 2. You can also use
-     <option/-q=#/ to set the quiet level, overriding the configuration file.
-     Configuration Item: <literal/quiet/.
--->
-     �Ų� - ��Ľɽ�����ά���ƥ�����Ȥ�Τ������ʽ��Ϥ�Ԥ��ޤ���
-     ���� 2 �Ĥޤ� q ��Ťͤ뤳�ȤǤ���Ť��ˤǤ��ޤ���
-     �ޤ���<option/-q=#/ �Τ褦���Ų���٥����ꤷ�ơ�����ե������
-     ��񤭤��뤳�Ȥ�Ǥ��ޤ���
-     ������� - <literal/quiet/
-     </VarListEntry>
-
-     <VarListEntry><term><option/-i/</><term><option/--important/</>
-     <ListItem><Para>
-<!--
-     Print only important deps; for use with unmet causes only Depends and 
-     Pre-Depends relations to be printed.
-     Configuration Item: <literal/APT::Cache::Important/.
--->
-     �ֽ��ספΤ�ɽ�� - Dipends �� Pre-Depends �Τ�ɽ�����뤿�ᡢ
-     unmet �ȶ��˻��Ѥ��ޤ���
-     ������� - <literal/APT::Cache::Important/
-     </VarListEntry>
-
-     <VarListEntry><term><option/-f/</><term><option/--full/</>
-     <ListItem><Para>
-<!--
-     Print full package records when searching. 
-     Configuration Item: <literal/APT::Cache::ShowFull/.
--->
-     search �������ѥå������쥳���ɤ�ɽ�����ޤ���
-     ������� - <literal/APT::Cache::ShowFull/
-     </VarListEntry>
-
-     <VarListEntry><term><option/-a/</><term><option/--all-versions/</>
-     <ListItem><Para>
-<!--
-     Print full records for all available versions, this is only applicable to 
-     the show command. 
-     Configuration Item: <literal/APT::Cache::AllVersions/.
--->
-     �����Ѳ�ǽ�С����������쥳���ɤ�ɽ�����ޤ���
-     show ���ޥ�ɤǤΤ�Ŭ�ѤǤ��ޤ���
-     ������� - <literal/APT::Cache::AllVersions/
-     </VarListEntry>
-
-     <VarListEntry><term><option/-g/</><term><option/--generate/</>
-     <ListItem><Para>
-<!--
-     Perform automatic package cache regeneration, rather than use the cache 
-     as it is. This is the default, to turn it off use <option/- -no-generate/.
-     Configuration Item: <literal/APT::Cache::Generate/.
--->
-     ���Τޤޥ���å������Ѥ���ΤǤϤʤ�����ưŪ�˥ѥå���������å����
-     ���������ޤ�������ϥǥե���Ȥ�ư��Ǥ�����<option/--no-generate/ ��
-     ���Ѥ����̵���ˤǤ��ޤ���
-     ������� - <literal/APT::Cache::Generate/
-     </VarListEntry>
-
-     <VarListEntry><term><option/--names-only/</><term><option/-n/</>
-     <ListItem><Para>
-<!--
-     Only search on the package names, not the long description. 
-     Configuration Item: <literal/APT::Cache::NamesOnly/.
--->
-     ����ʸ�ǤϤʤ����ѥå�����̾����Τ߸������ޤ���
-     ������� - <literal/APT::Cache::NamesOnly/
-     </VarListEntry>
-
-     <VarListEntry><term><option/--all-names/</>
-     <ListItem><Para>
-<!--
-     Make <literal/pkgnames/ print all names, including virtual packages 
-     and missing dependencies. 
-     Configuration Item: <literal/APT::Cache::AllNames/.
--->
-     <literal/pkgnames/ �ǡ����ۥѥå������������ʰ�¸�ط���ޤ᤿��̾�Τ�
-     ɽ�������ޤ���
-     ������� - <literal/APT::Cache::AllNames/
-     </VarListEntry>
-
-     <VarListEntry><term><option/--recurse/</>
-     <ListItem><Para>
-<!--
-     Make <literal/depends/ recursive so that all packages mentioned are 
-     printed once.
-     Configuration Item: <literal/APT::Cache::RecurseDepends/.
--->
-     <literal/depends/ �ǡ����ꤷ�����ѥå�������Ƶ�Ū�˰��٤�ɽ�����ޤ���
-     ������� - <literal/APT::Cache::RecurseDepends/
-     </VarListEntry>
-
-     &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Files</>
--->
- <RefSect1><Title>�ե�����</>
-   <variablelist>
-     <VarListEntry><term><filename>/etc/apt/sources.list</></term>
-     <ListItem><Para>
-<!--
-     locations to fetch packages from.
-     Configuration Item: <literal/Dir::Etc::SourceList/.
--->
-     �ѥå������μ�������
-     ������� - <literal/Dir::Etc::SourceList/
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&statedir;/lists/</></term>
-     <ListItem><Para>
-<!--
-     storage area for state information for each package resource specified in
-     &sources-list;
-     Configuration Item: <literal/Dir::State::Lists/.
--->
-     &sources-list; �˻��ꤷ���ѥå������꥽�������Ȥξ��־����Ǽ���ꥢ��
-     ������� - <literal/Dir::State::Lists/
-     </VarListEntry>
-  
-     <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
-     <ListItem><Para>
-<!--
-     storage area for state information in transit.
-     Configuration Item: <literal/Dir::State::Lists/ (implicit partial).
--->
-     ��������־����Ǽ���ꥢ��
-     ������� - <literal/Dir::State::Lists/ (ɬ��Ū���Դ����Ǥ�)
-     </VarListEntry>     
-   </variablelist>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>��Ϣ����</>
-   <para>
-   &apt-conf;, &sources-list;, &apt-get;
- </RefSect1>
-
-<!--
- <RefSect1><Title>Diagnostics</>
--->
- <RefSect1><Title>���ǥ�å�����</>
-   <para>
-<!--
-   <command/apt-cache/ returns zero on normal operation, decimal 100 on error.
--->
-   <command/apt-cache/ �����ｪλ���� 0 ���֤��ޤ���
-   ���顼���ˤϽ��ʤ� 100 ���֤��ޤ���
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;   
-</refentry>
diff --git a/doc/ja/apt-cache.ja.8.xml b/doc/ja/apt-cache.ja.8.xml
new file mode 100644
index 000000000..1d30e224d
--- /dev/null
+++ b/doc/ja/apt-cache.ja.8.xml
@@ -0,0 +1,701 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-cache</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-cache</refname>
+<!--
+    <refpurpose>APT package handling utility -\- cache manipulator</refpurpose>
+-->
+    <refpurpose>APT パッケージ操作ユーティリティ -- キャッシュ操作</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-cache</command>
+      <arg><option>-hvsn</option></arg>
+      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-c=<replaceable>file</replaceable></option></arg>
+      <group choice="req">
+         <arg>add <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg></arg>
+         <arg>gencaches</arg>
+         <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>stats</arg>
+         <arg>dump</arg>
+         <arg>dumpavail</arg>
+         <arg>unmet</arg>
+         <arg>search <arg choice="plain"><replaceable>regex</replaceable></arg></arg>
+         <arg>show <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>depends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
+         <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
+         <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
+      </group>   
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-cache</command> performs a variety of operations on APT's package 
+   cache. <command>apt-cache</command> does not manipulate the state of the system 
+   but does provide operations to search and generate interesting output 
+   from the package metadata.</para>
+-->
+   <para><command>apt-cache</command> は APT のパッケージキャッシュに対して、
+   さまざまな操作を行います。
+   <command>apt-cache</command> は、システム状態の操作は行いませんが、
+   パッケージのメタデータより検索したり、
+   興味深い出力を生成するといった操作を提供します。</para>
+
+<!--
+   <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the
+   commands below must be present.</para>
+-->
+   <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+   以下に挙げるコマンドが必要です。</para>
+
+   <variablelist>
+<!--
+     <varlistentry><term>add <replaceable>file(s)</replaceable></term>
+     <listitem><para><literal>add</literal> adds the named package index files to the package cache.
+     This is for debugging only.</para></listitem>
+-->
+     <varlistentry><term>add <replaceable>file(s)</replaceable></term>
+     <listitem><para><literal>add</literal> は、
+     パッケージキャッシュに指定したパッケージインデックスファイルを追加します。
+     デバッグ専用です。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>gencaches</term>
+<!--
+     <listitem><para><literal>gencaches</literal> performs the same operation as 
+     <command>apt-get check</command>. It builds the source and package caches from 
+     the sources in &sources-list; and from
+     <filename>/var/lib/dpkg/status</filename>.</para></listitem>
+-->
+     <listitem><para><literal>gencaches</literal> は、
+     <command>apt-get check</command> と同じ動作を提供します。
+     これは &sources-list; 内の取得元と 
+     <filename>/var/lib/dpkg/status</filename>から、
+     ソースとパッケージのキャッシュを構築します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>showpkg <replaceable>pkg(s)</replaceable></term>
+<!--
+     <listitem><para><literal>showpkg</literal> displays information about the packages listed on the 
+     command line. Remaining arguments are package names. The available 
+     versions and reverse dependencies of each package listed are listed, as 
+     well as forward dependencies for each version. Forward (normal) 
+     dependencies are those packages upon which the package in question 
+     depends; reverse dependencies are those packages that depend upon the 
+     package in question. Thus, forward dependencies must be satisfied for a 
+     package, but reverse dependencies need not be.
+     For instance, <command>apt-cache showpkg libreadline2</command> would produce 
+     output similar to the following:</para>
+-->
+     <listitem><para><literal>showpkg</literal> は、
+     コマンドライン上に列挙したパッケージの情報を表示します。
+     後に続く引数はパッケージ名となります。
+     各パッケージについて、有効なバージョンと被依存関係を列挙し、
+     さらにその各バージョンについて依存関係を表示します。
+     (通常の) 依存関係とは、対象のパッケージが依存しているパッケージを指します。
+     また、被依存関係とは、対象のパッケージに依存しているパッケージを指します。
+     従って、パッケージの依存関係は満たさなければなりませんが、
+     被依存関係は満たす必要はありません。
+     実例として、以下に <command>apt-cache showpkg libreadline2</command> の
+     出力を掲げます。</para>
+     
+<informalexample><programlisting>
+Package: libreadline2
+Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
+Reverse Depends: 
+  libreadlineg2,libreadline2
+  libreadline2-altdev,libreadline2
+Dependencies:
+2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
+Provides:
+2.1-12 - 
+Reverse Provides: 
+</programlisting></informalexample>
+			    
+<!--
+     <para>Thus it may be seen that libreadline2, version 2.1-12, depends on
+     libc5 and ncurses3.0 which must be installed for libreadline2 to work. 
+     In turn, libreadlineg2 and libreadline2-altdev depend on libreadline2. If
+     libreadline2 is installed, libc5 and ncurses3.0 (and ldso) must also be
+     installed; libreadlineg2 and libreadline2-altdev do not have to be
+     installed. For the specific meaning of the remainder of the output it
+     is best to consult the apt source code.</para></listitem>
+     </varlistentry>
+-->
+     <para>つまり、libreadline2 の version 2.1-12 は、
+     libc5 と ncurses3.0 に依存していて、libreadline2 が動作するには、
+     これらをインストールする必要があるということが判ります。
+     一方、libreadlineg2 と libreadline2-altdev は libreadline2 に依存しています。
+     libreadline2 をインストールするためには、libc5, ncurses3.0, ldso を
+     すべてインストールしなければなりませんが、libreadlineg2 と 
+     libreadline2-altdev はインストールする必要はありません。
+     出力の残りの部分の意味については、
+     apt のソースコードを調べるのが最良でしょう。</para></listitem>
+     </varlistentry>
+
+<!--
+     <varlistentry><term>stats</term><listitem><para><literal>stats</literal> displays some statistics about the cache.
+     No further arguments are expected. Statistics reported are:
+-->
+     <varlistentry><term>stats</term><listitem><para><literal>stats</literal> 
+     はキャッシュについての統計情報を表示します。
+     それ以上、引数は必要ありません。以下の統計情報を表示します。
+     <itemizedlist>
+<!--
+       <listitem><para><literal>Total package names</literal> is the number of package names found 
+       in the cache.</para>
+       </listitem>
+-->
+       <listitem><para><literal>パッケージ名総数</literal>は、
+       キャッシュに存在するパッケージ数を表します。</para>
+       </listitem>
+       
+<!--
+       <listitem><para><literal>Normal packages</literal> is the number of regular, ordinary package 
+       names; these are packages that bear a one-to-one correspondence between 
+       their names and the names used by other packages for them in 
+       dependencies. The majority of packages fall into this category.</para>
+       </listitem>
+-->
+       <listitem><para><literal>通常パッケージ</literal>は、
+       公式の普通のパッケージ数を表します。
+       これは、他のパッケージの依存関係で使用された名称で、それが一対一に対応
+       するパッケージです。
+       大多数のパッケージはこのカテゴリに入ります。</para>
+       </listitem>
+
+<!--
+       <listitem><para><literal>Pure virtual packages</literal> is the number of packages that exist 
+       only as a virtual package name; that is, packages only "provide" the 
+       virtual package name, and no package actually uses the name. For 
+       instance, "mail-transport-agent" in the Debian GNU/Linux system is a 
+       pure virtual package; several packages provide "mail-transport-agent", 
+       but there is no package named "mail-transport-agent".</para>
+       </listitem>
+-->
+       <listitem><para><literal>純粋仮想パッケージ</literal>は、
+       仮想パッケージ名としてのみ存在するパッケージ
+       (仮想パッケージ名のみを「提供」し、
+       実際にはいかなるパッケージもその名称を持たない) の数を表します。
+       例えば、Debian GNU/Linux システムでは "mail-transport-agent"
+       は純粋仮想パッケージです。
+       "mail-transport-agent" を提供するパッケージはいくつもありますが、
+       "mail-transport-agent" という名称のパッケージはありません。</para>
+       </listitem>
+  
+<!--
+       <listitem><para><literal>Single virtual packages</literal> is the number of packages with only 
+       one package providing a particular virtual package. For example, in the
+       Debian GNU/Linux system, "X11-text-viewer" is a virtual package, but 
+       only one package, xless, provides "X11-text-viewer".</para>
+       </listitem>
+-->
+       <listitem><para><literal>単一仮想パッケージ</literal>は、
+       特定の仮想パッケージ名を提供するパッケージが、
+       ただ一つの場合の数を表します。
+       例えば、Debian GNU/Linux システムでは、"X11-text-viewer" 
+       は仮想パッケージですが、"X11-text-viewer" を提供するパッケージは、
+       xless パッケージのみということです。</para>
+       </listitem>
+
+<!--
+       <listitem><para><literal>Mixed virtual packages</literal> is the number of packages that either 
+       provide a particular virtual package or have the virtual package name 
+       as the package name. For instance, in the Debian GNU/Linux system, 
+       "debconf" is both an actual package, and provided by the debconf-tiny
+       package.</para>
+       </listitem>
+-->
+       <listitem><para><literal>複合仮想パッケージ</literal>は、
+       その仮想パッケージ名を提供するパッケージが複数あるか、
+       またパッケージ名と同じ仮想パッケージ名を持つパッケージ数を表します。
+       例えば、Debian GNU/Linux システムでは、
+       debconf は実際のパッケージ名でもありますが、
+       debconf-tiny によって提供もされています。</para>
+       </listitem>
+   
+<!--
+       <listitem><para><literal>Missing</literal> is the number of package names that were referenced in
+       a dependency but were not provided by any package. Missing packages may 
+       be in evidence if a full distribution is not accessed, or if a package
+       (real or virtual) has been dropped from the distribution. Usually they
+       are referenced from Conflicts statements.</para>
+       </listitem>
+-->
+       <listitem><para><literal>欠落</literal>は、依存関係中には存在するのに、
+       どのパッケージにも提供されていないパッケージ名の数を表します。
+       このパッケージがあるということは、
+       全ディストリビューションにアクセスできていないか、
+       (実ないし仮想) パッケージがディストリビューションからはずされてしまった可能性もあります。
+       通常では、構文が矛盾するとこのようになります。</para>
+       </listitem>
+
+<!--
+       <listitem><para><literal>Total distinct</literal> versions is the number of package versions 
+       found in the cache; this value is therefore at least equal to the 
+       number of total package names. If more than one distribution (both 
+       "stable" and "unstable", for instance), is being accessed, this value 
+       can be considerably larger than the number of total package names.</para>
+       </listitem>
+-->
+       <listitem><para><literal>個別バージョン総数</literal>は、
+       キャッシュに存在するパッケージのバージョンの数を表します。
+       そのため、この値は最小でもパッケージ名総数と一致します。
+       もし複数のディストリビューション (例 "stable" と "unstable" の両方)
+       を利用した場合、
+       この値はパッケージ名総数よりもかなり大きい数になります。</para>
+       </listitem>
+
+<!--
+       <listitem><para><literal>Total dependencies</literal> is the number of dependency relationships 
+       claimed by all of the packages in the cache.</para>
+       </listitem>
+-->
+       <listitem><para><literal>依存関係総数</literal>は、
+       キャッシュにあるすべてのパッケージで要求された依存関係の数です。</para>
+       </listitem>
+     </itemizedlist>
+     </para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>showsrc <replaceable>pkg(s)</replaceable></term>
+<!--
+     <listitem><para><literal>showsrc</literal> displays all the source package records that match
+     the given package names. All versions are shown, as well as all 
+     records that declare the name to be a Binary.</para></listitem>
+     </varlistentry>
+-->
+     <listitem><para><literal>showsrc</literal> は、
+     指定したパッケージ名に一致するソースパッケージを、すべて表示します。
+     バイナリになるときの名称を宣言したレコードと同様に、
+     すべてのバージョンについて表示します。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>dump</term>
+<!--
+     <listitem><para><literal>dump</literal> shows a short listing of every package in the cache. It is 
+     primarily for debugging.</para></listitem>
+     </varlistentry>
+-->
+     <listitem><para><literal>dump</literal> は、
+     キャッシュ内のパッケージそれぞれについて、短い一覧を表示します。
+     主にデバッグ用です。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>dumpavail</term>
+<!--
+     <listitem><para><literal>dumpavail</literal> prints out an available list to stdout. This is 
+     suitable for use with &dpkg; and is used by the &dselect; method.</para></listitem>
+-->
+     <listitem><para><literal>dumpavail</literal> は、
+     標準出力に利用可能なものの一覧を出力します。
+     &dpkg; と共に使用すると便利ですし、
+     &dselect; でも使用されます。</para></listitem>
+     </varlistentry>
+      
+     <varlistentry><term>unmet</term>
+<!--
+     <listitem><para><literal>unmet</literal> displays a summary of all unmet dependencies in the 
+     package cache.</para></listitem>
+     </varlistentry>
+-->
+     <listitem><para><literal>unmet</literal> は、
+     パッケージキャッシュ内にある、
+     不適当な依存関係の概要を表示します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>show <replaceable>pkg(s)</replaceable></term>
+<!--
+     <listitem><para><literal>show</literal> performs a function similar to 
+     <command>dpkg -\-print-avail</command>; it displays the package records for the 
+     named packages.</para></listitem>
+-->
+     <listitem><para><literal>show</literal> は、
+     <command>dpkg --print-avail</command> と同様の機能を実行します。
+     これは、指定したパッケージのパッケージレコードの表示です。</para>
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term>search <replaceable>regex [ regex ... ]</replaceable></term>
+<!--
+     <listitem><para><literal>search</literal> performs a full text search on all available package
+     lists for the regex pattern given. It searches the package names and the
+     descriptions for an occurrence of the regular expression and prints out
+     the package name and the short description. If <option>-\-full</option> is given
+     then output identical to <literal>show</literal> is produced for each matched
+     package, and if <option>-\-names-only</option> is given then the long description
+     is not searched, only the package name is.</para>
+-->
+     <listitem><para><literal>search</literal> は、与えられた正規表現によって、
+     すべての利用可能なパッケージに対して全文検索を行います。
+     パッケージ名と説明に対して検索を行い、
+     パッケージ名と短い説明文を表示します。
+     <option>--full</option> が与えられた場合、マッチしたパッケージに対し 
+     <literal>show</literal> と同じ情報を出力します。
+     <option>--names-only</option> が与えられた場合は、
+     説明文に対して検索を行わず、パッケージ名に対してのみ対象とします。</para>
+     <para>
+<!--
+     Separate arguments can be used to specify multiple search patterns that 
+     are and'ed together.</para></listitem>
+-->
+     空白で区切った引数で、
+     複数の検索パターンの and をとることができます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>depends <replaceable>pkg(s)</replaceable></term>
+<!--
+     <listitem><para><literal>depends</literal> shows a listing of each dependency a package has 
+     and all the possible other packages that can fulfill that dependency.</para></listitem>
+-->
+     <listitem><para><literal>depends</literal> は、
+     パッケージが持っている依存関係と、
+     その依存関係を満たす他のパッケージの一覧を表示します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
+<!--
+     <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
+      package has.</para></listitem>
+-->
+     <listitem><para><literal>rdepends</literal> は、
+     パッケージが持つ被依存関係を一覧表示します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term>
+<!--
+     <listitem><para>This command prints the name of each package in the system. The optional
+     argument is a prefix match to filter the name list. The output is suitable
+     for use in a shell tab complete function and the output is generated 
+     extremely quickly. This command is best used with the 
+     <option>-\-generate</option> option.</para></listitem>
+-->
+     <listitem><para>このコマンドは、
+     システムでの各パッケージの名称を表示します。
+     オプションの引数により、取得する一覧より先頭一致で抽出することができます。
+     この出力はシェルのタブによる補完機能に使いやすく、
+     また非常に速く生成されます。
+     このコマンドは <option>--generate</option> オプションと共に使用すると、
+     非常に便利です。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term>
+<!--
+     <listitem><para><literal>dotty</literal> takes a list of packages on the command line and 
+     generates output suitable for use by dotty from the 
+     <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink>
+     package. The result will be a set of nodes and edges representing the 
+     relationships between the packages. By default the given packages will 
+     trace out all dependent packages; this can produce a very large graph. 
+     To limit the output to only the packages listed on the command line,
+     set the <literal>APT::Cache::GivenOnly</literal> option.</para>
+-->
+     <listitem><para><literal>dotty</literal> は、
+     コマンドライン上のパッケージ名から、
+     <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</ulink> 
+     パッケージの dotty コマンドで利用するのに便利な出力を生成します。
+     結果はパッケージの関係を表わす、ノード・エッジのセットで表現されます。
+     デフォルトでは、すべての依存パッケージをトレースするので、
+     非常に大きい図が得られます。
+     これは、<literal>APT::Cache::GivenOnly</literal>
+     オプションを設定して解除できます。</para>
+
+<!--
+     <para>The resulting nodes will have several shapes; normal packages are boxes,
+     pure provides are triangles, mixed provides are diamonds, 
+     missing packages are hexagons. Orange boxes mean recursion was stopped 
+     [leaf packages], blue lines are pre-depends, green lines are conflicts.</para>
+-->
+     <para>結果のノードは数種の形状をとります。
+     通常パッケージは四角、純粋仮想パッケージは三角、複合仮想パッケージは菱形、
+     六角形は欠落パッケージをそれぞれ表します。
+     オレンジの四角は再帰が終了した「リーフパッケージ」、青い線は先行依存、
+     緑の線は競合を表します。</para>
+
+<!--
+     <para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
+-->
+     <para>注意) dotty は、
+     パッケージのより大きなセットのグラフは描けません。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term>
+<!--
+     <listitem><para><literal>policy</literal> is meant to help debug issues relating to the 
+     preferences file. With no arguments it will print out the 
+     priorities of each source. Otherwise it prints out detailed information
+     about the priority selection of the named package.</para></listitem>
+-->
+     <listitem><para><literal>policy</literal> は、
+     設定ファイル関係の問題について、デバッグを支援します。
+     引数を指定しなかった場合、取得元ごとの優先順位を表示します。
+     一方、パッケージ名を指定した場合、
+     優先順の詳細情報を表示します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>madison <replaceable>/[ pkg(s) ]</replaceable></term>
+<!--
+     <listitem><para><literal>apt-cache</literal>'s <literal>madison</literal> command attempts to mimic
+     the output format and a subset of the functionality of the Debian
+     archive management tool, <literal>madison</literal>.  It displays
+     available versions of a package in a tabular format.  Unlike the
+     original <literal>madison</literal>, it can only display information for
+     the architecture for which APT has retrieved package lists
+     (<literal>APT::Architecture</literal>).</para></listitem>
+-->
+     <listitem><para><literal>apt-cache</literal> の <literal>madison</literal>
+     コマンドは、Debian アーカイブ管理ツール <literal>madison</literal> 
+     の機能のサブセットで、出力フォーマットを真似ようとします。
+     パッケージの利用可能バージョンを表形式で表示します。
+     オリジナルの <literal>madison</literal> と違い、
+     APT がパッケージ一覧を検索したアーキテクチャ 
+     (<literal>APT::Architecture</literal>) 
+     の情報を表示するだけです。</para></listitem>
+     </varlistentry>
+   </variablelist>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+   &apt-cmdblurb;
+   
+   <variablelist>
+     <varlistentry><term><option>-p</option></term><term><option>--pkg-cache</option></term>
+<!--
+     <listitem><para>Select the file to store the package cache. The package cache is the 
+     primary cache used by all operations.
+     Configuration Item: <literal>Dir::Cache::pkgcache</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージキャッシュを格納するファイルを選択します。
+     パッケージキャッシュは、すべての操作で使用される一次キャッシュです。
+     設定項目 - <literal>Dir::Cache::pkgcache</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-s</option></term><term><option>--src-cache</option></term>
+<!--
+     <listitem><para>Select the file to store the source cache. The source is used only by
+     <literal>gencaches</literal> and it stores a parsed version of the package 
+     information from remote sources. When building the package cache the 
+     source cache is used to advoid reparsing all of the package files.
+     Configuration Item: <literal>Dir::Cache::srcpkgcache</literal>.</para></listitem>
+-->
+     <listitem><para>ソースキャッシュを格納するファイルを選択します。
+     このソースキャッシュは <literal>gencaches</literal> でのみ使用され、
+     ここに解析された取得元のパッケージ情報が格納されています。
+     パッケージキャッシュを構築する際に、ソースキャッシュは、
+     全パッケージファイルを再解析を避ける上で便利です。
+     <!--advoid は avoid のミススペル？ -->
+     設定項目 - <literal>Dir::Cache::srcpkgcache</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+<!--
+     <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
+     More q's will produce more quietness up to a maximum of 2. You can also use
+     <option>-q=#</option> to set the quietness level, overriding the configuration file.
+     Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+     <listitem><para>静粛 - 進捗表示を省略し、
+     ログをとるのに便利な出力を行います。
+     最大 2 つまで q を重ねることでさらに静粛にできます。
+     また、<option>-q=#</option> のように静粛レベルを指定して、
+     設定ファイルを上書きすることもできます。
+     設定項目 - <literal>quiet</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-i</option></term><term><option>--important</option></term>
+<!--
+     <listitem><para>Print only important dependencies; for use with unmet. Causes only Depends and 
+     Pre-Depends relations to be printed.
+     Configuration Item: <literal>APT::Cache::Important</literal>.</para></listitem>
+-->
+     <listitem><para>「重要」依存関係のみ表示 - unmet と共に使用します。
+     これは「依存」関係と「先行依存」関係のみを表示するためです。
+     設定項目 - <literal>APT::Cache::Important</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-f</option></term><term><option>--full</option></term>
+<!--
+     <listitem><para>Print full package records when searching. 
+     Configuration Item: <literal>APT::Cache::ShowFull</literal>.</para></listitem>
+-->
+     <listitem><para>search 時に全パッケージレコードを表示します。
+     設定項目 - <literal>APT::Cache::ShowFull</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-a</option></term><term><option>--all-versions</option></term>
+<!--
+     <listitem><para>Print full records for all available versions. This is the
+     default; to turn it off, use <option>-\-no-all-versions</option>.
+     If <option>-\-no-all-versions</option> is specified, only the candidate version
+     will displayed (the one which would be selected for installation).
+     This option is only applicable to  the <literal>show</literal> command.
+     Configuration Item: <literal>APT::Cache::AllVersions</literal>.</para></listitem>
+-->
+     <listitem><para>全利用可能バージョンのレコード全体を表示します。
+     これはデフォルトの動作で、
+     無効にするには <option>--no-all-versions</option> を使用してください。
+     <option>--no-all-versions</option> を指定すると、
+     候補バージョン (インストールの際に選択されるもの) だけ表示します。
+     このオプションは、show コマンドでのみ適用できます。
+     設定項目 - <literal>APT::Cache::AllVersions</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-g</option></term><term><option>--generate</option></term>
+<!--
+     <listitem><para>Perform automatic package cache regeneration, rather than use the cache 
+     as it is. This is the default; to turn it off, use <option>-\-no-generate</option>.
+     Configuration Item: <literal>APT::Cache::Generate</literal>.</para></listitem>
+-->
+     <listitem><para>そのままキャッシュを使用するのではなく、
+     自動的にパッケージキャッシュを再生成します。これはデフォルトの動作で、
+     無効にするには <option>--no-generate</option> を使用してください。
+     設定項目 - <literal>APT::Cache::Generate</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--names-only</option></term><term><option>-n</option></term>
+<!--
+     <listitem><para>Only search on the package names, not the long descriptions. 
+     Configuration Item: <literal>APT::Cache::NamesOnly</literal>.</para></listitem>
+-->
+     <listitem><para>説明文ではなく、パッケージ名からのみ検索します。
+     設定項目 - <literal>APT::Cache::NamesOnly</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--all-names</option></term>
+<!--
+     <listitem><para>Make <literal>pkgnames</literal> print all names, including virtual packages 
+     and missing dependencies. 
+     Configuration Item: <literal>APT::Cache::AllNames</literal>.</para></listitem>
+-->
+     <listitem><para><literal>pkgnames</literal> で、
+     仮想パッケージや欠落依存関係を含めた全名称を表示します。
+     設定項目 - <literal>APT::Cache::AllNames</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--recurse</option></term>
+<!--
+     <listitem><para>Make <literal>depends</literal> and <literal>rdepends</literal> recursive so
+     that all packages mentioned are printed once.
+     Configuration Item: <literal>APT::Cache::RecurseDepends</literal>.</para></listitem>
+-->
+     <listitem><para><literal>depends</literal> や <literal>rdepends</literal>
+     で、指定した全パッケージを再帰的に一度に表示します。
+     設定項目 - <literal>APT::Cache::RecurseDepends</literal></para></listitem>
+     </varlistentry>
+
+      <varlistentry><term><option>--installed</option></term>
+<!--
+      <listitem><para>
+      Limit the output of <literal>depends</literal> and <literal>rdepends</literal> to
+      packages which are currently installed.
+      Configuration Item: <literal>APT::Cache::Installed</literal>.</para></listitem>
+-->
+      <listitem><para>
+      <literal>depends</literal> や <literal>rdepends</literal> の出力を、
+      現在インストールされているパッケージに限定します。
+      設定項目 - <literal>APT::Cache::Installed</literal></para></listitem>
+      </varlistentry>
+ 
+     &apt-commonoptions;
+     
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+   <variablelist>
+     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+<!--
+     <listitem><para>Locations to fetch packages from.
+     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージの取得元。
+     設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>&statedir;/lists/</filename></term>
+<!--
+     <listitem><para>Storage area for state information for each package resource specified in
+     &sources-list;
+     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+-->
+     <listitem><para>&sources-list; に指定した、
+     パッケージリソースごとの状態情報格納エリア。
+     設定項目 - <literal>Dir::State::Lists</literal></para></listitem>
+     </varlistentry>
+  
+     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+<!--
+     <listitem><para>Storage area for state information in transit.
+     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+-->
+     <listitem><para>取得中状態情報格納エリア。
+     設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem>
+     </varlistentry>     
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-conf;, &sources-list;, &apt-get;
+   </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+   <para><command>apt-cache</command> returns zero on normal operation, decimal 100 on error.
+   </para>
+-->
+   <para><command>apt-cache</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。
+   </para>
+ </refsect1>
+
+ &manbugs;
+ &translator; 
+</refentry>
diff --git a/doc/ja/apt-cdrom.ja.8.sgml b/doc/ja/apt-cdrom.ja.8.sgml
deleted file mode 100644
index 4328ef8c2..000000000
--- a/doc/ja/apt-cdrom.ja.8.sgml
+++ /dev/null
@@ -1,230 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.3 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-cdrom</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-cdrom</>
-<!--
-    <refpurpose>APT CDROM managment utility</>
--->
-    <refpurpose>APT CDROM �����桼�ƥ���ƥ�</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-cdrom</>
-      <arg><option>-hvrmfan</></arg>
-      <arg><option>-d=<replaceable/cdrom mount point/</></arg>
-      <arg><option>-o=<replaceable/config string/</></arg>
-      <arg><option>-c=<replaceable/file/</></arg>
-      <group choice=req>
-         <arg>add</>
-         <arg>ident</>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
-
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title>����</>
-   <para>
-<!--
-   <command/apt-cdrom/ is used to add a new CDROM to APTs list of available 
-   sources. <command/apt-cdrom/ takes care of determining the structure of 
-   the disc as well as correcting for several possible mis-burns and 
-   verifying the index files.   
--->
-   <command/apt-cdrom/ �����Ѳ�ǽ�ʼ������Ȥ��ơ�APT �Υꥹ�Ȥ˿����� CDROM ��
-   �ɲä���Τ������Ǥ���<command/apt-cdrom/ �ϾƤ�»�����ǽ�ʸ¤���������
-   �ǥ�������¤�γ�ǧ������ޤ����ޤ�������ǥå����ե�����γ�ǧ��Ԥ��ޤ���
-   <para>
-<!--
-   It is necessary to use <command/apt-cdrom/ to add CDs to the APT system, 
-   it cannot be done by hand. Furthermore each disk in a multi-cd set must be
-   inserted and scanned separately to account for possible mis-burns.
--->
-   APT �����ƥ�� CD ���ɲä���Τϼ��ȤǤ��񤷤����ᡢ<command/apt-cdrom/
-   ��ɬ�פǤ������ξ塢CD ���åȤΥǥ������� 1 ��Ťġ��Ƥ�»���������Ǥ��뤫
-   ɾ�����ʤ���Фʤ�ޤ���
-   <para>
-<!--
-   Unless the <option/-h/, or <option/- -help/ option is given one of the
-   commands below must be present.
--->
-   <option/-h/ �� <option/--help/ ��������ʲ��˵󤲤륳�ޥ�ɤ�ɬ�פǤ���
-   <VariableList>
-     <VarListEntry><Term>add</Term>
-     <ListItem><Para>
-<!--
-     <literal/add/ is used to add a new disc to the source list. It will unmount the
-     CDROM device, prompt for a disk to be inserted and then procceed to 
-     scan it and copy the index files. If the disc does not have a proper
-     <filename>.disk/</> directory you will be prompted for a descriptive 
-     title.
--->
-     <literal/add/ �ϡ��������ǥ�������������ꥹ�Ȥ��ɲä��ޤ���
-     CDROM �ǥХ����Υ���ޥ���ȡ��ǥ����������Υץ���ץȤ�ɽ���θ�ˡ�
-     �ǥ������Υ������ȥ���ǥå����ե�����Υ��ԡ���Ԥ��ޤ���
-     �ǥ������������� <filename>.disk/</> �ǥ��쥯�ȥ꤬¸�ߤ��ʤ���硢
-     �����ȥ�����Ϥ���褦¥���ޤ���
-     <para>
-<!--
-     APT uses a CDROM ID to track which disc is currently in the drive and
-     maintains a database of these IDs in 
-     <filename>&statedir;/cdroms.list</>
--->
-     APT �ϡ����ߥɥ饤�֤ˤ���ǥ������Υȥ�å��������������CDROM ID ��
-     ���Ѥ��ޤ����ޤ����� ID ��<filename>&statedir;/cdroms.list</> ���
-     �ǡ����١����Ǵ������ޤ���
-     </VarListEntry>
-     
-     <VarListEntry><Term>ident</Term>
-     <ListItem><Para>
-<!--
-     A debugging tool to report the identity of the current disc as well
-     as the stored file name
--->
-     ��Ǽ����Ƥ���ե�����̾�ȡ����ߤΥǥ�������Ʊ�줫�ɤ������ݡ��Ȥ��롢
-     �ǥХå��ġ���Ǥ���
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Options</>
--->
- <RefSect1><Title>���ץ����</>
-
-   &apt-cmdblurb;
-   
-   <VariableList>
-     <VarListEntry><term><option/-d/</><term><option/--cdrom/</>
-     <ListItem><Para>
-<!--
-     Mount point; specify the location to mount the cdrom. This mount 
-     point must be listed in <filename>/etc/fstab</> and propely configured.
-     Configuration Item: <literal/Acquire::cdrom::mount/.
--->
-     �ޥ���ȥݥ���� - cdrom ��ޥ���Ȥ��������ꤷ�ޤ���
-     ���Υޥ���ȥݥ���Ȥϡ�<filename>/etc/fstab</> �����������ꤵ��Ƥ���
-     ɬ�פ�����ޤ���
-     ������� - <literal/Acquire::cdrom::mount/
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-r/</><term><option/--rename/</>
-     <ListItem><Para>
-<!--
-     Rename a disc; change the label of a disk or override the disks 
-     given label. This option will cause <command/apt-cdrom/ to prompt for 
-     a new label.
-     Configuration Item: <literal/APT::CDROM::Rename/.
--->
-     �ǥ�������̾���ѹ� - ���ꤷ��̾���ǥǥ������Υ�٥���ѹ����������ޤ���
-     ���Υ��ץ����ˤ�ꡢ<command/apt-cdrom/ ����������٥�����Ϥ���褦
-     ¥���ޤ���
-     ������� - <literal/APT::CDROM::Rename/
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-m/</><term><option/--no-mount/</>
-     <ListItem><Para>
-<!--
-     No mounting; prevent <command/apt-cdrom/ from mounting and unmounting 
-     the mount point.
-     Configuration Item: <literal/APT::CDROM::NoMount/.
--->
-     �ޥ���Ȥʤ� - <command/apt-cdrom/ �����ޥ���ȥݥ���Ȥ�
-     �ޥ���ȡ�����ޥ���Ȥ���Τ��ɤ��ޤ���
-     ������� - <literal/APT::CDROM::NoMount/
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-f/</><term><option/--fast/</>
-     <ListItem><Para>
-<!--
-     Fast Copy; Assume the package files are valid and do not check 
-     every package. This option should be used only if
-     <command/apt-cdrom/ has been run on this disc before and did not detect 
-     any errors.
-     Configuration Item: <literal/APT::CDROM::Fast/.
--->
-     ��®���ԡ� - �ѥå������ե����뤬�����Ǥ���Ȳ��ꤷ��
-     �����å��������Ԥ��ޤ��󡣡�
-     ���Υ��ץ����ϡ����Υǥ������ǰ��� <command/apt-cdrom/ ��ԤäƤ��ꡢ
-     ���顼�򸡽Ф��ʤ��ä����Τ߻��Ѥ��٤��Ǥ���
-     ������� - <literal/APT::CDROM::Fast/
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-a/</><term><option/--thorough/</>
-     <ListItem><Para>
-<!--
-     Thorough Package Scan; This option may be needed with some old 
-     Debian 1.1/1.2 discs that have Package files in strange places. It 
-     takes much longer to scan the CD but will pick them all up.
--->
-     �����ѥå������������ -  �Ť� Debian 1.1/1.2 �Υǥ������ϡ�
-     �ѥå������ե����뤬�㤦���ˤ��뤿�ᡢ���Υ��ץ�����Ȥ�ɬ�פ�
-     ���뤫�⤷��ޤ���
-     CD �򥹥���󤹤�Τ����˻��֤�������ޤ��������ѥå������ե������
-     ��Ф��뤳�Ȥ��Ǥ��ޤ���
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-n/</>
-                   <term><option/--just-print/</>
-                   <term><option/--recon/</>
-                   <term><option/--no-act/</>
-     <ListItem><Para>
-<!--
-     No Changes; Do not change the &sources-list; file and do not 
-     write index files. Everything is still checked however.
-     Configuration Item: <literal/APT::CDROM::NoAct/.
--->
-     �ѹ��ʤ� - &sources-list; �ե�������ѹ��䡢����ǥå����ե������
-     �񤭹��ߤ�Ԥ��ޤ��󡣤ȤϤ��������٤ƤΥ����å��ϹԤ��ޤ���
-     ������� - <literal/APT::CDROM::NoAct/
-     </VarListEntry> 
- 
-     &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>��Ϣ����</>
-   <para>
-   &apt-conf;, &apt-get;, &sources-list;
- </RefSect1>
-
-<!--
- <RefSect1><Title>Diagnostics</>
--->
- <RefSect1><Title>���ǥ�å�����</>
-   <para>
-<!--
-   <command/apt-cdrom/ returns zero on normal operation, decimal 100 on error.
--->
-   <command/apt-get/ �����ｪλ���� 0 ���֤��ޤ���
-   ���顼���ˤϽ��ʤ� 100 ���֤��ޤ���
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator; 
-</refentry>
-
diff --git a/doc/ja/apt-cdrom.ja.8.xml b/doc/ja/apt-cdrom.ja.8.xml
new file mode 100644
index 000000000..bf84b4749
--- /dev/null
+++ b/doc/ja/apt-cdrom.ja.8.xml
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <date>14 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+   <refentrytitle>apt-cdrom</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-cdrom</refname>
+<!--
+    <refpurpose>APT CDROM management utility</refpurpose>
+-->
+    <refpurpose>APT CDROM 管理ユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-cdrom</command>
+      <arg><option>-hvrmfan</option></arg>
+      <arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg>
+      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-c=<replaceable>file</replaceable></option></arg>
+      <group>
+         <arg>add</arg>
+         <arg>ident</arg>
+      </group>   
+   </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list
+    of available sources. <command>apt-cdrom</command> takes care of
+   determining the structure of
+   the disc as well as correcting for several possible mis-burns and 
+   verifying the index files.   
+   </para>
+-->
+   <para><command>apt-cdrom</command> は利用可能な取得元として、
+   APT のリストに新しい CDROM を追加するのに便利です。
+   <command>apt-cdrom</command> は焼き損じを可能な限り補正し、
+   ディスク構造の確認を助けます。また、インデックスファイルの確認を行います。
+   </para>
+
+<!--
+   <para>It is necessary to use <command>apt-cdrom</command> to add CDs to the
+   APT system, 
+   it cannot be done by hand. Furthermore each disk in a multi-cd set must be
+   inserted and scanned separately to account for possible mis-burns.
+   </para>
+-->
+   <para>APT システムに手作業で CD を追加するのは難しいため、
+   <command>apt-cdrom</command> が必要になります。
+   その上、CD セットのディスクを 1 枚づつ、
+   焼き損じを補正できるか評価しなければなりません。
+   </para>
+
+<!--
+   <para>Unless the <option>-h</option>, or <option>-\-help</option> option is
+    given one of the commands below must be present.
+-->
+   <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+   以下に挙げるコマンドが必要です。
+   
+    <variablelist>
+     <varlistentry><term>add</term>
+<!--
+     <listitem><para><literal>add</literal> is used to add a new disc to the
+     source list. It will unmount the
+     CDROM device, prompt for a disk to be inserted and then procceed to 
+     scan it and copy the index files. If the disc does not have a proper
+     <filename>disk</filename> directory you will be prompted for a descriptive 
+     title.
+-->
+     <listitem><para><literal>add</literal> は、
+     新しいディスクを取得元リストに追加します。
+     CDROM デバイスのアンマウント、ディスク挿入のプロンプトの表示の後に、
+     ディスクのスキャンとインデックスファイルのコピーを行います。
+     ディスクに正しい <filename>disk</filename> ディレクトリが存在しない場合、
+     タイトルを入力するよう促します。
+     </para>
+
+<!--
+     <para>APT uses a CDROM ID to track which disc is currently in the drive and
+     maintains a database of these IDs in 
+     <filename>&statedir;/cdroms.list</filename>
+-->
+     <para>APT は、現在ドライブにあるディスクのトラックから取得した、
+     CDROM ID を使用します。またその ID を、
+     <filename>&statedir;/cdroms.list</filename> 内のデータベースで管理します。
+     </para>
+     </listitem>
+     </varlistentry>
+     
+     <varlistentry><term>ident</term>
+<!--
+     <listitem><para>A debugging tool to report the identity of the current
+      disc as well as the stored file name
+-->
+     <listitem><para>格納されているファイル名と、
+     現在のディスクが同一かどうかをレポートする、デバッグツールです。
+     </para>
+     </listitem>
+     </varlistentry>
+    </variablelist>
+   </para>
+ </refsect1>
+
+ <refsect1><title>Options</title>
+   &apt-cmdblurb;
+   
+   <variablelist>
+     <varlistentry><term><option>-d</option></term><term><option>--cdrom</option></term>
+<!--
+     <listitem><para>Mount point; specify the location to mount the cdrom. This
+      mount point must be listed in <filename>/etc/fstab</filename> and
+      properly configured.
+      Configuration Item: <literal>Acquire::cdrom::mount</literal>.
+-->
+     <listitem><para>マウントポイント - cdrom をマウントする場所を指定します。
+     このマウントポイントは、
+     <filename>/etc/fstab</filename> に正しく設定されている必要があります。
+     設定項目 - <literal>Acquire::cdrom::mount</literal>
+     </para>
+     </listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>-r</option></term><term><option>--rename</option></term>
+<!--
+     <listitem><para>Rename a disc; change the label of a disk or override the
+      disks given label. This option will cause <command>apt-cdrom</command> to
+      prompt for a new label.
+     Configuration Item: <literal>APT::CDROM::Rename</literal>.
+-->
+     <listitem><para>ディスクの名前変更 - 
+     指定した名前でディスクのラベルを変更・更新します。このオプションにより、
+     <command>apt-cdrom</command> が新しいラベルを入力するよう促します。
+     設定項目 - <literal>APT::CDROM::Rename</literal>
+     </para>
+     </listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>-m</option></term><term><option>--no-mount</option></term>
+<!--
+     <listitem><para>No mounting; prevent <command>apt-cdrom</command> from
+      mounting and unmounting the mount point.
+     Configuration Item: <literal>APT::CDROM::NoMount</literal>.
+-->
+     <listitem><para>マウントなし - <command>apt-cdrom</command> が、
+     マウントポイントにマウント・アンマウントしないようにします。
+     設定項目 - <literal>APT::CDROM::NoMount</literal>
+     </para>
+     </listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>-f</option></term><term><option>--fast</option></term>
+<!--
+     <listitem><para>Fast Copy; Assume the package files are valid and do not
+      check every package. This option should be used only if
+     <command>apt-cdrom</command> has been run on this disc before and did not
+     detect any errors.
+     Configuration Item: <literal>APT::CDROM::Fast</literal>.
+-->
+     <listitem><para>高速コピー - パッケージファイルが妥当であると仮定し、
+     チェックを全く行いません。このオプションは、
+     このディスクで以前 <command>apt-cdrom</command> を行っており、
+     エラーを検出しなかった場合のみ使用すべきです。
+     設定項目 - <literal>APT::CDROM::Fast</literal>
+     </para>
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-a</option></term><term><option>--thorough</option></term>
+<!--
+     <listitem><para>Thorough Package Scan; This option may be needed with some
+      old Debian 1.1/1.2 discs that have Package files in strange places. It 
+      takes much longer to scan the CD but will pick them all up.
+-->
+     <listitem><para>完全パッケージスキャン -  
+     古い Debian 1.1/1.2 のディスクは、パッケージファイルが違う場所にあるため、
+     このオプションを使う必要があるかもしれません。
+     CD をスキャンするのに非常に時間がかかりますが、
+     全パッケージファイルを抽出することができます。
+     </para>
+     </listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>-n</option></term>
+                   <term><option>--just-print</option></term>
+                   <term><option>--recon</option></term>
+                   <term><option>--no-act</option></term>
+<!--
+     <listitem><para>No Changes; Do not change the &sources-list; file and do
+     not write index files. Everything is still checked however.
+     Configuration Item: <literal>APT::CDROM::NoAct</literal>.
+-->
+     <listitem><para>変更なし - &sources-list; ファイルの変更や、
+     インデックスファイルの書き込みを行いません。
+     とはいえ、すべてのチェックは行います。
+     設定項目 - <literal>APT::CDROM::NoAct</literal>
+     </para>
+     </listitem>
+     </varlistentry> 
+
+     &apt-commonoptions;
+
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-conf;, &apt-get;, &sources-list;
+   </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+   <para><command>apt-cdrom</command> returns zero on normal operation, decimal 100 on error.
+-->
+   <para><command>apt-cdrom</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。
+   </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+</refentry>
+
diff --git a/doc/ja/apt-config.ja.8.xml b/doc/ja/apt-config.ja.8.xml
new file mode 100644
index 000000000..b1d90f5b5
--- /dev/null
+++ b/doc/ja/apt-config.ja.8.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-config</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-config</refname>
+<!--
+    <refpurpose>APT Configuration Query program</refpurpose>
+-->
+    <refpurpose>APT 設定取得プログラム</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-config</command>
+      <arg><option>-hv</option></arg>
+      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-c=<replaceable>file</replaceable></option></arg>
+      <group choice="req">
+         <arg>shell</arg>
+         <arg>dump</arg>
+      </group>   
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-config</command> is an internal program used by various
+   portions of the APT suite to provide consistent configurability. It accesses
+   the main configuration file <filename>/etc/apt/apt.conf</filename> in a
+   manner that is easy to use by scripted applications.</para>
+-->
+   <para><command>apt-config</command> は、
+   APT スイートの様々な所で一貫した設定を行うために使用する、内部ツールです。
+   スクリプトアプリケーションで使いやすい方法で、
+   メイン設定ファイル <filename>/etc/apt/apt.conf</filename> 
+   にアクセスします。</para>
+
+<!--
+   <para>Unless the <option>-h</option>, or <option>-\-help</option> option is
+   given one of the commands below must be present.
+   </para>
+-->
+   <para><option>-h</option> や <option>--help</option> オプションを除き、
+   以下に挙げるコマンドが必要です。</para>
+   
+   <variablelist>
+     <varlistentry><term>shell</term>
+     <listitem><para>
+<!--
+     shell is used to access the configuration information from a shell 
+     script. It is given pairs of arguments, the first being a shell 
+     variable and the second the configuration value to query. As output 
+     it lists a series of shell assignments commands for each present value. 
+     In a shell script it should be used like:
+-->
+     shell は、シェルスクリプトから設定情報にアクセスするのに使用します。
+     引数として、まずシェル変数、次に取得したい設定値をペアで与えます。
+     出力として、現在の値ごとにシェル代入コマンドの一覧を表示します。
+     シェルスクリプト内では、以下のようにしてください。
+     </para>
+
+<informalexample><programlisting>
+OPTS="-f"
+RES=`apt-config shell OPTS MyApp::options`
+eval $RES
+</programlisting></informalexample>
+
+<!--
+     <para>This will set the shell environment variable $OPTS to the value of
+     MyApp::options with a default of <option>-f</option>.</para>
+-->
+     <para>これは、MyApp::options の値をシェル環境変数 $OPTS にセットします。
+     デフォルト値は <option>-f</option> となります。</para>
+
+ <!--
+    <para>The configuration item may be postfixed with a /[fdbi]. f returns
+     file names, d returns directories, b returns true or false and i returns
+     an integer. Each of the returns is normalized and verified
+     internally.</para>
+-->
+     <para>設定項目は /[fdbi] を後ろに付けられます。
+     f はファイル名を、d はディレクトリを、b は true か false を、
+     i は整数を返します。
+     返り値ごとに内部で正規化と検証を行います。</para>
+
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term>dump</term>
+     <listitem><para>
+<!--
+     Just show the contents of the configuration space.</para>
+-->
+     設定箇所の内容を表示するだけです。</para>
+     </listitem>
+     </varlistentry>
+
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+   &apt-cmdblurb;
+   
+   <variablelist>
+   
+     &apt-commonoptions;
+     
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-conf;
+   </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+   <para><command>apt-config</command> returns zero on normal operation, decimal 100 on error.
+-->
+   <para><command>apt-config</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。
+   </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+ 
+</refentry>
+
diff --git a/doc/ja/apt-extracttemplates.ja.1.xml b/doc/ja/apt-extracttemplates.ja.1.xml
new file mode 100644
index 000000000..079c89402
--- /dev/null
+++ b/doc/ja/apt-extracttemplates.ja.1.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-extracttemplates</refentrytitle>
+   <manvolnum>1</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-extracttemplates</refname>
+<!--
+    <refpurpose>Utility to extract DebConf config and templates from Debian packages</refpurpose>
+-->
+    <refpurpose>Debian パッケージから DebConf 設定とテンプレートを抽出するユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+  <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-extracttemplates</command>
+      <arg><option>-hv</option></arg>
+      <arg><option>-t=<replaceable>temporary directory</replaceable></option></arg>
+      <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-extracttemplates</command> will take one or more Debian package files
+   as input and write out (to a temporary directory) all associated config
+   scripts and template files. For each passed in package that contains 
+   config scripts and templates, one line of output will be generated
+   in the format:</para>
+-->
+   <para><command>apt-extracttemplates</command> は、
+   入力に複数の Debian パッケージをとり、
+   関連する設定スクリプトとテンプレートファイルを 
+   (一時ディレクトリに) 出力します。
+   設定スクリプト・テンプレートファイルを持つ、
+   渡されたパッケージそれぞれに対し、以下の形式で 1 行ずつ出力します。</para>
+   <para>package version template-file config-script</para>
+<!--
+   <para>template-file and config-script are written to the temporary directory
+   specified by the -t or -\-tempdir (<literal>APT::ExtractTemplates::TempDir</literal>) 
+   directory, with filenames of the form <filename>package.template.XXXX</filename> and 
+   <filename>package.config.XXXX</filename></para>
+-->
+   <para>テンプレートファイルや、設定スクリプトは、
+   -t や --tempdir で指定した一時ディレクトリ 
+   (<literal>APT::ExtractTemplates::TempDir</literal>) に書き出され、
+   ファイル名は、<filename>package.template.XXXX</filename> や
+   <filename>package.config.XXXX</filename> と言った形になります。</para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+   &apt-cmdblurb;
+
+   <variablelist>
+     <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
+<!--
+     <listitem><para>
+     Temporary directory in which to write extracted debconf template files
+     and config scripts
+     Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
+-->
+     <listitem><para>
+     抽出した debconf テンプレートファイルや設定スクリプトを書き出す、
+     一時ディレクトリ。
+     設定項目 - <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
+     </varlistentry>
+
+     &apt-commonoptions;
+     
+   </variablelist>
+     
+   
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+   <para><command>apt-extracttemplates</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+ 
+</refentry>
diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml
new file mode 100644
index 000000000..be6bbd767
--- /dev/null
+++ b/doc/ja/apt-ftparchive.ja.1.xml
@@ -0,0 +1,1020 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-ftparchive</refentrytitle>
+   <manvolnum>1</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-ftparchive</refname>
+<!--
+    <refpurpose>Utility to generate index files</refpurpose>
+-->
+    <refpurpose>インデックスファイル生成ユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-ftparchive</command>
+      <arg><option>-hvdsq</option></arg>
+      <arg><option>--md5</option></arg>
+      <arg><option>--delink</option></arg>
+      <arg><option>--readonly</option></arg>
+      <arg><option>--contents</option></arg>
+      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-c=<replaceable>file</replaceable></option></arg>      
+      <group choice="req">
+         <arg>packages<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+         <arg>sources<arg choice="plain" rep="repeat"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg>
+         <arg>contents <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+         <arg>release <arg choice="plain"><replaceable>path</replaceable></arg></arg>
+         <arg>generate <arg choice="plain"><replaceable>config-file</replaceable></arg> <arg choice="plain" rep="repeat"><replaceable>section</replaceable></arg></arg>
+         <arg>clean <arg choice="plain"><replaceable>config-file</replaceable></arg></arg>
+      </group>
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-ftparchive</command> is the command line tool that generates the index 
+   files that APT uses to access a distribution source. The index files should 
+   be generated on the origin site based on the content of that site.</para>
+-->
+   <para><command>apt-ftparchive</command> は、
+   APT が取得元にアクセスするのに必要な、
+   インデックスファイルを生成するコマンドラインツールです。
+   インデックスファイルは、元のサイトの内容に基づき生成されるべきです。</para>
+
+<!--
+   <para><command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; program,
+   incorporating its entire functionality via the <literal>packages</literal> command.
+   It also contains a contents file generator, <literal>contents</literal>, and an 
+   elaborate means to 'script' the generation process for a complete 
+   archive.</para>
+-->
+   <para><command>apt-ftparchive</command> は、
+   &dpkg-scanpackages; プログラムのスーパーセットで、
+   <literal>packages</literal> コマンド経由で機能全体を取り込んでいます。
+   また、contents ファイルジェネレータ <literal>contents</literal> と
+   完全なアーカイブの生成プロセス「スクリプト」である綿密な手段を含んでいます。</para>
+
+<!--
+   <para>Internally <command>apt-ftparchive</command> can make use of binary databases to 
+   cache the contents of a .deb file and it does not rely on any external 
+   programs aside from &gzip;. When doing a full generate it automatically 
+   performs file-change checks and builds the desired compressed output files.</para>
+-->
+   <para>本質的に <command>apt-ftparchive</command> は、
+   .deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。
+   また、&gzip; 以外のいかなる外部プログラムにも依存しません。
+   すべて生成する際には、
+   ファイル変更点の検出と希望した圧縮出力ファイルの作成を自動的に実行します。</para>
+   
+<!--
+   <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the
+   commands below must be present.</para>
+-->
+   <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+   以下に挙げるコマンドが必要です。</para>
+   
+   <variablelist>
+     <varlistentry><term>packages</term>
+     <listitem><para>
+<!--
+     The packages command generates a package file from a directory tree. It
+     takes the given directory and recursively searches it for .deb files, 
+     emitting a package record to stdout for each. This command is 
+     approximately equivalent to &dpkg-scanpackages;.</para>
+-->
+     packages コマンドは、
+     ディレクトリツリーからパッケージファイルを生成します。
+     与えられたディレクトリから再帰検索し、.deb ファイルを取得します。
+     またパッケージレコードを標準出力にそれぞれ出力します。
+     このコマンドは、&dpkg-scanpackages; とほぼ同じです。</para>
+
+<!--
+     <para>The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+-->
+     <para><option>--db</option> オプションで、
+     キャッシュ DB を指定できます。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>sources</term>
+     <listitem><para>
+<!--
+     The <literal>sources</literal> command generates a source index file from a directory tree. 
+     It takes the given directory and recursively searches it for .dsc files,
+     emitting a source record to stdout for each. This command is approximately
+     equivalent to &dpkg-scansources;.</para>
+-->
+     <literal>sources</literal> コマンドは、
+     ディレクトリツリーからソースインデックスファイルを生成します。
+     与えられたディレクトリから再帰検索し、.dsc ファイルを取得します。
+     またソースレコードを標準出力にそれぞれ出力します。
+     このコマンドは、&dpkg-scansources; とほぼ同じです。</para>
+     <para>
+<!--
+     If an override file is specified then a source override file will be 
+     looked for with an extension of .src. The -\-source-override option can be 
+     used to change the source override file that will be used.</para></listitem>
+-->
+     override ファイルを指定した場合、
+     src 拡張子がついたソースオーバーライドファイルを探します。
+     使用するソースオーバーライドファイルを変更するのには、
+     --source-override オプションを使用します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>contents</term>
+     <listitem><para>
+<!--
+     The <literal>contents</literal> command generates a contents file from a directory tree. It
+     takes the given directory and recursively searches it for .deb files, 
+     and reads the file list from each file. It then sorts and writes to stdout
+     the list of files matched to packages. Directories are not written to 
+     the output. If multiple packages own the same file then each package is
+     separated by a comma in the output.</para>
+-->
+     <literal>contents</literal> コマンドは、
+     ディレクトリツリーからコンテンツファイルを生成します。
+     与えられたディレクトリから再帰検索し、.deb ファイルを取得します。
+     またファイルごとにファイル一覧を読み取ります。
+     その後、パッケージに対応するファイル一覧を標準出力にソートして出力します。
+     ディレクトリは出力に含まれません。
+     複数のパッケージが同じファイルを持つ場合、
+     パッケージ名をカンマ区切りで出力します。</para>
+     <para>
+<!--
+     The option <option>-\-db</option> can be used to specify a binary caching DB.</para></listitem>
+-->
+     <option>--db</option> オプションで、
+     キャッシュ DB を指定できます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>release</term>
+     <listitem><para>
+<!--
+     The <literal>release</literal> command generates a Release file from a
+     directory tree. It recursively searches the given directory for
+     Packages, Packages.gz, Packages.bz2, Sources, Sources.gz,
+     Sources.bz2, Release and md5sum.txt files.  It then writes to
+     stdout a Release file containing an MD5 digest and SHA1 digest
+     for each file.</para>
+-->
+     <literal>release</literal> コマンドは、
+     ディレクトリツリーから Release ファイルを生成します。
+     与えられたディレクトリから、Packages, Packages.gz, Packages.bz2, Sources, 
+     Sources.gz, Sources.bz2, Release, md5sum.txt 
+     といったファイルを再帰検索します。
+     その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを含んだ
+     Release ファイルを、標準出力に書き出します。</para>
+     <para>
+<!--
+     Values for the additional metadata fields in the Release file are
+     taken from the corresponding variables under
+     <literal>APT::FTPArchive::Release</literal>,
+     e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The supported fields
+     are: <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+     <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+     <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal>.</para></listitem>
+-->
+     Release ファイルの追加メタデータフィールドの値は、
+     <literal>APT::FTPArchive::Release</literal> 以下の相当する値 
+     (例: <literal>APT::FTPArchive::Release::Origin</literal>) をとります。
+     サポートするフィールドは、
+     <literal>Origin</literal>, <literal>Label</literal>, <literal>Suite</literal>,
+     <literal>Version</literal>, <literal>Codename</literal>, <literal>Date</literal>,
+     <literal>Architectures</literal>, <literal>Components</literal>, <literal>Description</literal> です。</para></listitem>
+
+     </varlistentry>
+
+     <varlistentry><term>generate</term>
+     <listitem><para>
+<!--
+     The <literal>generate</literal> command is designed to be runnable from a cron script and
+     builds indexes according to the given config file. The config language
+     provides a flexible means of specifying which index files are built from 
+     which directories, as well as providing a simple means of maintaining the
+     required settings.</para></listitem>
+-->
+     <literal>generate</literal> コマンドは、
+     cron スクリプトから実行できるよう設計されており、
+     与えられた設定ファイルに従ってインデックスを生成します。
+     設定言語は、必要な設定を維持する簡単な方法を提供すると共に、
+     インデックスファイルをどのディレクトリから作成するかを指定する、
+     柔軟な方法を提供します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>clean</term>
+     <listitem><para>
+<!--
+     The <literal>clean</literal> command tidies the databases used by the given 
+     configuration file by removing any records that are no longer necessary.</para></listitem>
+-->
+     <literal>clean</literal> コマンドは、
+     設定ファイルで与えられたデータベースを、
+     もう必要ないレコードを削除して整理します。</para></listitem>
+     </varlistentry>     
+   </variablelist>  
+ </refsect1>
+
+<!--
+ <refsect1><title>The Generate Configuration</title>
+-->
+ <refsect1><title>generate 設定</title>
+   <para>
+<!--
+   The <literal>generate</literal> command uses a configuration file to describe the 
+   archives that are going to be generated. It follows the typical ISC 
+   configuration format as seen in ISC tools like bind 8 and dhcpd. 
+   &apt-conf; contains a description of the syntax. Note that the generate 
+   configuration is parsed in sectional manner, but &apt-conf; is parsed in a
+   tree manner. This only effects how the scope tag is handled.</para>
+-->
+   <literal>generate</literal> コマンドは、
+   生成するアーカイブに関する記述をした設定ファイルを使用します。
+   設定ファイルは、bind 8 や dhcpd といった ISC ツールに見られるような、
+   ISC 設定フォーマットに従います。
+   &apt-conf; に、文法の説明があります。
+   generate 設定はセクション法で解析しますが、
+   &apt-conf; はツリー法で解析するのに注意してください。
+   これはスコープタグの扱い方に違いがあるだけです。</para>
+
+   <para>
+<!--
+   The generate configuration has 4 separate sections, each described below.</para>
+-->
+   generate 設定には 4 個の独立したセクションがあります。
+   以下それぞれ説明します。</para>
+
+<!--
+   <refsect2><title>Dir Section</title>
+-->
+   <refsect2><title>Dir セクション</title>
+     <para>
+<!--
+     The <literal>Dir</literal> section defines the standard directories needed to 
+     locate the files required during the generation process. These 
+     directories are prepended to certain relative paths defined in later 
+     sections to produce a complete an absolute path.</para>
+-->
+     <literal>Dir</literal> セクションは、
+     生成プロセスで必要なファイルを配置するための、
+     標準ディレクトリを定義します。
+     このディレクトリは、完全な絶対パスを生成するため、
+     後のセクションで定義される相対パスの前に結合します。</para>
+     <variablelist>     
+      <varlistentry><term>ArchiveDir</term>
+      <listitem><para>
+<!--
+      Specifies the root of the FTP archive, in a standard
+      Debian configuration this is the directory that contains the 
+      <filename>ls-LR</filename> and dist nodes.</para></listitem>
+-->
+      FTP アーカイブのルートを指定します。
+      標準的な Debian 設定では、このディレクトリには 
+      <filename>ls-LR</filename> と dist ノードがあります。</para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>OverrideDir</term>
+      <listitem><para>
+<!--
+      Specifies the location of the override files.</para></listitem>
+-->
+      オーバーライドファイルの場所を指定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>CacheDir</term>
+      <listitem><para>
+<!--
+      Specifies the location of the cache files</para></listitem>
+-->
+      キャッシュファイルの場所を指定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>FileListDir</term>
+      <listitem><para>
+<!--
+      Specifies the location of the file list files, 
+      if the <literal>FileList</literal> setting is used below.</para></listitem>
+-->
+      <literal>FileList</literal> 設定が以下で使用されている場合、
+      ファイルリストファイルの場所を指定します。</para></listitem>
+      </varlistentry>
+     </variablelist>
+   </refsect2>
+   
+<!--
+   <refsect2><title>Default Section</title>
+-->
+   <refsect2><title>Default セクション</title>
+     <para>
+<!--
+     The <literal>Default</literal> section specifies default values, and settings 
+     that control the operation of the generator. Other sections may override 
+     these defaults with a per-section setting.</para>
+-->
+     <literal>Default</literal> セクションではデフォルト値を指定します。
+     また、生成器の動作を制御する設定も行います。
+     他のセクションでは、ここにあるデフォルト値を、
+     セクションごとの設定で上書きします。</para>
+     <variablelist>     
+      <varlistentry><term>Packages::Compress</term>
+      <listitem><para>
+<!--
+      Sets the default compression schemes to use 
+      for the Package index files. It is a string that contains a space 
+      separated list of at least one of: '.' (no compression), 'gzip' and 
+      'bzip2'. The default for all compression schemes is '. gzip'.</para></listitem>
+-->
+      Package インデックスファイルのデフォルトの圧縮方法を設定します。
+      少なくともひとつは '.' (圧縮なし), 'gzip', 'bzip2' が入る、
+      空白区切りの文字列です。
+      圧縮方法のデフォルトはすべて '. gzip' です。</para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>Packages::Extensions</term>
+      <listitem><para>
+<!--
+      Sets the default list of file extensions that are package files.
+      This defaults to '.deb'.</para></listitem>
+-->
+      パッケージファイル拡張子のデフォルト値を列挙します。
+      このデフォルト値は '.deb' です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Sources::Compress</term>
+      <listitem><para>
+<!--
+      This is similar to <literal>Packages::Compress</literal> 
+      except that it controls the compression for the Sources files.</para></listitem>
+-->
+      <literal>Packages::Compress</literal> と同様に、
+      Sources ファイルの圧縮方法を指定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Sources::Extensions</term>
+      <listitem><para>
+<!--
+      Sets the default list of file extensions that are source files.
+      This defaults to '.dsc'.</para></listitem>
+-->
+      ソースファイル拡張子のデフォルト値を列挙します。
+      このデフォルト値は '.dsc' です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Contents::Compress</term>
+      <listitem><para>
+<!--
+      This is similar to <literal>Packages::Compress</literal> 
+      except that it controls the compression for the Contents files.</para></listitem>
+-->
+      <literal>Packages::Compress</literal> と同様に、
+      Contents ファイルの圧縮方法を指定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>DeLinkLimit</term>
+      <listitem><para>
+<!--
+      Specifies the number of kilobytes to delink (and 
+      replace with hard links) per run. This is used in conjunction with the 
+      per-section <literal>External-Links</literal> setting.</para></listitem>
+-->
+      実行するごとに delink (及びハードリンクの置き換え) する量を、
+      キロバイト単位で指定します。セクションごとの 
+      <literal>External-Links</literal> 設定と合わせて使います。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>FileMode</term>
+      <listitem><para>
+<!--
+      Specifies the mode of all created index files. It 
+      defaults to 0644. All index files are set to this mode with no regard 
+      to the umask.</para></listitem>
+-->
+      作成したインデックスファイルのモードを指定します。
+      デフォルトは 0644 です。全インデックスファイルは、
+      umask を無視してこのモードを使用します。</para></listitem>
+      </varlistentry>
+     </variablelist>
+   </refsect2>
+   
+<!--
+   <refsect2><title>TreeDefault Section</title>
+-->
+   <refsect2><title>TreeDefault セクション</title>
+     <para>
+<!--
+     Sets defaults specific to <literal>Tree</literal> sections. All of these
+     variables are substitution variables and have the strings $(DIST), 
+     $(SECTION) and $(ARCH) replaced with their respective values.</para>
+-->
+     特定の <literal>Tree</literal> セクションのデフォルトを設定します。
+     これらの変数はすべて置換変数であり、
+     文字列 $(DIST), $(SECTION), $(ARCH) をそれぞれの値に展開します。</para>
+
+     <variablelist>     
+      <varlistentry><term>MaxContentsChange</term>
+      <listitem><para>
+<!--
+      Sets  the number of kilobytes of contents 
+      files that are generated each day. The contents files are round-robined
+      so that over several days they will all be rebuilt.</para></listitem>
+-->
+      日毎に生成する contents ファイルをキロバイト単位で設定します。
+      contents ファイルをラウンドロビンし、数日経つとすべて再生成します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>ContentsAge</term>
+      <listitem><para>
+<!--
+      Controls the number of days a contents file is allowed
+      to be checked without changing. If this limit is passed the mtime of the 
+      contents file is updated. This case can occur if the package file is 
+      changed in such a way that does not result in a new contents file 
+      [override edit for instance]. A hold off is allowed in hopes that new 
+      .debs will be installed, requiring a new file anyhow. The default is 10, 
+      the units are in days.</para></listitem>
+-->
+      変更がない contents ファイルをチェックする日数を指定します。
+      この制限を越えた contents ファイルの mtime を、更新します。
+      パッケージファイルが変更されても、
+      [例えば上書き編集で] contents ファイルが更新されないような場合、
+      こういったことが発生します。
+      新しい .deb ファイルをインストールしたい場合、保留を解除でき、
+      少なくとも新しいファイルが必要です。
+      デフォルトは 10 で、単位は日です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Directory</term>
+      <listitem><para>
+<!--
+      Sets the top of the .deb directory tree. Defaults to
+      <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename></para></listitem>
+-->
+      .deb ディレクトリツリーの先頭を設定します。デフォルトは
+      <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename> です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>SrcDirectory</term>
+      <listitem><para>
+<!--
+      Sets the top of the source package directory tree. Defaults to
+      <filename>$(DIST)/$(SECTION)/source/</filename></para></listitem>
+-->
+      ソースパッケージディレクトリツリーの先頭を設定します。デフォルトは
+      <filename>$(DIST)/$(SECTION)/source/</filename> です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Packages</term>
+      <listitem><para>
+<!--
+      Sets the output Packages file. Defaults to 
+      <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename></para></listitem>
+-->
+      Packages ファイルの出力先を設定します。デフォルトは
+      <filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename> です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Sources</term>
+      <listitem><para>
+<!--
+      Sets the output Packages file. Defaults to 
+      <filename>$(DIST)/$(SECTION)/source/Sources</filename></para></listitem>
+-->
+      Packages ファイルの出力先を設定します。デフォルトは
+      <filename>$(DIST)/$(SECTION)/source/Sources</filename> です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>InternalPrefix</term>
+      <listitem><para>
+<!--
+      Sets the path prefix that causes a symlink to be
+      considered an internal link instead of an external link. Defaults to
+      <filename>$(DIST)/$(SECTION)/</filename></para></listitem>
+-->
+      外部リンクではなく、内部リンクと見なす判断材料となる、
+      パスのプレフィックスを設定します。デフォルトは、
+      <filename>$(DIST)/$(SECTION)/</filename> です。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Contents</term>
+      <listitem><para>
+<!--
+      Sets the output Contents file. Defaults to
+      <filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes multiple 
+      Packages files to map onto a single Contents file (such as the default) 
+      then <command>apt-ftparchive</command> will integrate those package files 
+      together automatically.</para></listitem>
+-->
+      Contents ファイルの出力先を設定します。デフォルトは、
+      <filename>$(DIST)/Contents-$(ARCH)</filename> です。
+      複数の Packages ファイルを ひとつの Contents ファイルにまとめられる設定 
+      (デフォルト) の場合、<command>apt-ftparchive</command> 
+      は自動でパッケージファイルをまとめます。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Contents::Header</term>
+      <listitem><para>
+<!--
+      Sets header file to prepend to the contents output.</para></listitem>
+-->
+      contents の出力に付けるヘッダファイルを設定します。</para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>BinCacheDB</term>
+      <listitem><para>
+<!--
+      Sets the binary cache database to use for this 
+      section. Multiple sections can share the same database.</para></listitem>
+-->
+      このセクションで使用するバイナリキャッシュデータベースを設定します。
+      複数のセクションで同じデータベースを共有できます。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>FileList</term>
+      <listitem><para>
+<!--
+      Specifies that instead of walking the directory tree, 
+      <command>apt-ftparchive</command> should read the list of files from the given 
+      file. Relative files names are prefixed with the archive directory.</para></listitem>
+-->
+      ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command> 
+      が読み込むファイル一覧ファイルを指定します。
+      相対ファイル名は、アーカイブディレクトリが先頭につきます。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>SourceFileList</term>
+      <listitem><para>
+<!--
+      Specifies that instead of walking the directory tree, 
+      <command>apt-ftparchive</command> should read the list of files from the given 
+      file. Relative files names are prefixed with the archive directory. 
+      This is used when processing source indexs.</para></listitem>
+-->
+      ディレクトリツリーを走査する代わりに、<command>apt-ftparchive</command>
+      が読み込むファイル一覧ファイルを指定します。
+      相対ファイル名は、アーカイブディレクトリが先頭につきます。
+      ソースインデックスを処理する際に使用します。</para></listitem>
+      </varlistentry>
+     </variablelist>     
+   </refsect2>
+   
+<!--
+   <refsect2><title>Tree Section</title>
+-->
+   <refsect2><title>Tree セクション</title>
+     <para>
+<!--
+     The <literal>Tree</literal> section defines a standard Debian file tree which 
+     consists of a base directory, then multiple sections in that base 
+     directory and finally multiple Architectures in each section. The exact 
+     pathing used is defined by the <literal>Directory</literal> substitution variable.</para> 
+-->
+     <literal>Tree</literal> セクションでは、
+     ベースディレクトリからの標準 Debian ファイルツリー、
+     ベースディレクトリの複数のセクション、
+     最終的にはセクションごとの複数のアーキテクチャを定義します。
+     使用する正確なパスは、<literal>Directory</literal> 変数で定義されます。</para> 
+     <para>
+<!--
+     The <literal>Tree</literal> section takes a scope tag which sets the 
+     <literal>$(DIST)</literal> variable and defines the root of the tree 
+     (the path is prefixed by <literal>ArchiveDir</literal>).
+     Typically this is a setting such as <filename>dists/woody</filename>.</para>
+-->
+     <literal>Tree</literal> セクションは、
+     <literal>$(DIST)</literal> 変数で設定されているスコープタグをとり、
+     ツリーのルート (<literal>ArchiveDir</literal>が先頭につくパス) 
+     を定義します。
+     通常、この設定は <filename>dists/woody</filename> のようになります。</para>
+     <para>
+<!--
+     All of the settings defined in the <literal>TreeDefault</literal> section can be
+     use in a <literal>Tree</literal> section as well as three new variables.</para>
+-->
+     <literal>TreeDefault</literal> セクションで定義される設定はすべて、
+     3 個の新しい変数と同様に、
+     <literal>Tree</literal> セクションで使用できます。</para>
+     <para>
+<!--
+     When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> 
+     performs an operation similar to:
+-->
+     <literal>Tree</literal> セクションを処理する際、
+     <command>apt-ftparchive</command> は以下のような操作を行います。
+<informalexample><programlisting>
+for i in Sections do 
+   for j in Architectures do
+      Generate for DIST=scope SECTION=i ARCH=j
+</programlisting></informalexample></para>
+
+     <variablelist>     
+      <varlistentry><term>Sections</term>
+      <listitem><para>
+<!--
+      This is a space separated list of sections which appear 
+      under the distribution, typically this is something like 
+      <literal>main contrib non-free</literal></para></listitem>
+-->
+      distribution 以下に現れるセクションを、空白区切りで指定したリストです。
+      通常、<literal>main contrib non-free</literal>のようになります。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Architectures</term>
+      <listitem><para>
+<!--
+      This is a space separated list of all the 
+      architectures that appear under search section. The special architecture 
+      'source' is used to indicate that this tree has a source archive.</para></listitem>
+-->
+      search セクション以下に現れるアーキテクチャを、
+      空白区切りで指定したリストです。
+      特殊アーキテクチャ 'source' は、
+      ソースアーカイブのツリーであることを示します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>BinOverride</term>
+      <listitem><para>
+<!--
+      Sets the binary override file. The override file 
+      contains section, priority and maintainer address information.</para></listitem>
+-->
+      バイナリオーバーライドファイルを設定します。
+      このオーバーライドファイルには、セクション、優先度、
+      メンテナのアドレスといった情報が含まれています。</para></listitem>
+      </varlistentry>
+
+      <varlistentry><term>SrcOverride</term>
+      <listitem><para>
+<!--
+      Sets the source override file. The override file 
+      contains section information.</para></listitem>
+-->
+      ソースオーバーライドファイルを設定します。
+      このオーバーライドファイルには、
+      セクションの情報が含まれています。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>ExtraOverride</term>
+      <listitem><para>
+<!--
+      Sets the binary extra override file.</para></listitem>
+-->
+      バイナリ特別オーバーライドファイルを設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>SrcExtraOverride</term>
+      <listitem><para>
+<!--
+      Sets the source extra override file.</para></listitem> 
+-->
+      ソース特別オーバーライドファイルを設定します。</para></listitem> 
+      </varlistentry>
+     </variablelist>
+   </refsect2>
+   
+<!--
+   <refsect2><title>BinDirectory Section</title>
+-->
+   <refsect2><title>BinDirectory セクション</title>
+     <para>
+<!--
+     The <literal>bindirectory</literal> section defines a binary directory tree 
+     with no special structure. The scope tag specifies the location of 
+     the binary directory and the settings are similar to the <literal>Tree</literal> 
+     section with no substitution variables or
+     <literal>Section</literal><literal>Architecture</literal> settings.</para>
+-->
+     <literal>bindirectory</literal> セクションでは、
+     特殊な構造を持たないバイナリディレクトリツリーを定義します。
+     スコープタグはバイナリディレクトリの場所を指定し、
+     設定は、変数展開のない <literal>Tree</literal> セクションや 
+     <literal>Section</literal><literal>Architecture</literal> 設定に似ています。</para>
+     <variablelist>
+      <varlistentry><term>Packages</term>
+      <listitem><para>
+<!--
+      Sets the Packages file output.</para></listitem>
+-->
+      Packages ファイルの出力先を設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>SrcPackages</term>
+      <listitem><para>
+<!--
+      Sets the Sources file output. At least one of
+      <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem>
+-->
+      Sources ファイルの出力先を設定します。
+      少なくとも <literal>Packages</literal> や <literal>SrcPackages</literal>
+      は設定されていなければなりません。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>Contents</term>
+      <listitem><para>
+<!--
+      Sets the Contents file output. (optional)</para></listitem>
+-->
+      Contents ファイルの出力先を設定します。(オプション)</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>BinOverride</term>
+      <listitem><para>
+<!--
+      Sets the binary override file.</para></listitem>
+-->
+      バイナリオーバーライドファイルを設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>SrcOverride</term>
+      <listitem><para>
+<!--
+      Sets the source override file.</para></listitem>
+-->
+      ソースオーバーライドファイルを設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>ExtraOverride</term>
+      <listitem><para>
+<!--
+      Sets the binary extra override file.</para></listitem>
+-->
+      バイナリ特別オーバーライドファイルを設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>SrcExtraOverride</term>
+      <listitem><para>
+<!--
+      Sets the source extra override file.</para></listitem>
+-->
+      ソース特別オーバーライドファイルを設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>BinCacheDB</term>
+      <listitem><para>
+<!--
+      Sets the cache DB.</para></listitem>
+-->
+      キャッシュ DB を設定します。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>PathPrefix</term>
+      <listitem><para>
+<!--
+      Appends a path to all the output paths.</para></listitem>
+-->
+      全出力パスに付加するパス。</para></listitem>
+      </varlistentry>
+      
+      <varlistentry><term>FileList, SourceFileList</term>
+      <listitem><para>
+<!--
+      Specifies the file list file.</para></listitem>
+-->
+      ファイル一覧ファイルを指定します。</para></listitem>
+      </varlistentry>
+     </variablelist>
+   </refsect2>
+ </refsect1>
+
+
+<!--
+ <refsect1><title>The Binary Override File</title>
+-->
+ <refsect1><title>バイナリオーバーライドファイル</title>
+<!--
+   <para>The binary override file is fully compatible with &dpkg-scanpackages;. It
+   contains 4 fields separated by spaces. The first field is the package name,
+   the second is the priority to force that package to, the third is the
+   the section to force that package to and the final field is the maintainer 
+   permutation field.</para>
+-->
+   <para>バイナリオーバーライドファイルは、
+   &dpkg-scanpackages; と完全に互換性があります。
+   ここには、空白区切りでフィールドが 4 個あります。
+   先頭のフィールドはパッケージ名、
+   2 番目のフィールドはパッケージに強制する優先度、
+   3 番目のフィールドはパッケージに強制するセクション、
+   最後のフィールドはメンテナ順列フィールドです。</para>
+<!--
+   <para>The general form of the maintainer field is:
+   <literallayout>old [// oldn]* => new</literallayout>
+   or simply,
+   <literallayout>new</literallayout>
+   The first form allows a double-slash separated list of old email addresses
+   to be specified. If any of those are found then new is substituted for the
+   maintainer field. The second form unconditionally substitutes the 
+   maintainer field.</para>
+-->
+   <para>メンテナフィールドは一般的には、
+   <literallayout>old [// oldn]* => new</literallayout>
+   という形式か、単純に
+   <literallayout>new</literallayout>
+   となります。
+   最初の形式は、// で区切られた古い email アドレスのリストを許可します。
+   この形式がある場合は、メンテナフィールドになるよう new に置換してください。
+   2 番目の形式は無条件にメンテナフィールドに置換します。</para>
+ </refsect1>
+
+ 
+<!--
+ <refsect1><title>The Source Override File</title>
+-->
+ <refsect1><title>ソースオーバーライドファイル</title>
+   <para>
+<!--
+   The source override file is fully compatible with &dpkg-scansources;. It
+   contains 2 fields separated by spaces. The first fields is the source 
+   package name, the second is the section to assign it.</para>
+-->
+   ソースオーバーライドファイルは、
+   &dpkg-scansources; と完全に互換性があります。
+   ここには、空白区切りでフィールドが 2 個あります。
+   先頭のフィールドはソースパッケージ名、
+   2 番目のフィールドは割り当てるセクションです。</para>
+ </refsect1>   
+
+<!--
+ <refsect1><title>The Extra Override File</title>
+-->
+ <refsect1><title>特別オーバーライドファイル</title>
+   <para>
+<!--
+   The extra override file allows any arbitrary tag to be added or replaced
+   in the output. It has 3 columns, the first is the package, the second is
+   the tag and the remainder of the line is the new value.</para>
+-->
+   特別オーバーライドファイルは、
+   出力中に任意のタグを追加・置換できるようにします。
+   3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。</para>
+ </refsect1>   
+
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+   &apt-cmdblurb;
+   
+   <variablelist>
+     <varlistentry><term><option>--md5</option></term>
+     <listitem><para>
+<!--
+     Generate MD5 sums. This defaults to on, when turned off the generated 
+     index files will not have MD5Sum fields where possible.
+     Configuration Item: <literal>APT::FTPArchive::MD5</literal></para></listitem>
+-->
+     MD5 sum を生成します。デフォルトで on になっており、
+     off にすると生成したインデックスファイルに MD5Sum フィールドがありません。
+     設定項目 - <literal>APT::FTPArchive::MD5</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-d</option></term><term><option>--db</option></term>
+     <listitem><para>
+<!--
+     Use a binary caching DB. This has no effect on the generate command.
+     Configuration Item: <literal>APT::FTPArchive::DB</literal>.</para></listitem>
+-->
+     バイナリキャッシュ DB を使用します。
+     generate コマンドには影響しません。
+     設定項目 - <literal>APT::FTPArchive::DB</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+     <listitem><para>
+<!--
+     Quiet; produces output suitable for logging, omitting progress indicators.
+     More q's will produce more quiet up to a maximum of 2. You can also use
+     <option>-q=#</option> to set the quiet level, overriding the configuration file. 
+     Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+     静粛 - 進捗表示を省略し、ログをとるのに便利な出力を行います。
+     最大 2 つまで q を重ねることでより静粛にできます。
+     また、<option>-q=#</option> のように静粛レベルを指定して、
+     設定ファイルを上書きすることもできます。
+     設定項目 - <literal>quiet</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--delink</option></term>
+     <listitem><para>
+<!--
+     Perform Delinking. If the <literal>External-Links</literal> setting is used then 
+     this option actually enables delinking of the files. It defaults to on and 
+     can be turned off with <option>-\-no-delink</option>.
+     Configuration Item: <literal>APT::FTPArchive::DeLinkAct</literal>.</para></listitem>
+-->
+     Delink を実行します。
+     <literal>External-Links</literal> 設定を使用している場合、
+     このオプションはファイルの delink を有効にします。
+     デフォルトは on で、
+     off にするには <option>--no-delink</option> としてください。
+     設定項目 - <literal>APT::FTPArchive::DeLinkAct</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--contents</option></term>
+     <listitem><para>
+<!--
+     Perform contents generation. When this option is set and package indexes
+     are being generated with a cache DB then the file listing will also be
+     extracted and stored in the DB for later use. When using the generate 
+     command this option also allows the creation of any Contents files. The 
+     default is on.
+     Configuration Item: <literal>APT::FTPArchive::Contents</literal>.</para></listitem>
+-->
+     contents の生成を行います。このオプションを指定し、
+     パッケージインデックスをキャッシュ DB と共に生成する際、
+     ファイルリストを後で使用するように、抽出し DB に格納します。
+     generate コマンドを使用する際、
+     このオプションでいずれの Contents ファイルも作成できます。
+     デフォルトは on です。
+     設定項目 - <literal>APT::FTPArchive::Contents</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-s</option></term><term><option>--source-override</option></term>
+     <listitem><para>
+<!--
+     Select the source override file to use with the <literal>sources</literal> command.
+     Configuration Item: <literal>APT::FTPArchive::SourceOverride</literal>.</para></listitem>
+-->
+     <literal>sources</literal> コマンドで使用する、
+     ソースオーバーライドファイルを選択します。
+     設定項目 - <literal>APT::FTPArchive::SourceOverride</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--readonly</option></term>
+     <listitem><para>
+<!--
+     Make the caching databases read only. 
+     Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem>
+-->
+     キャッシュデータベースを読み取り専用にします。
+     設定項目 - <literal>APT::FTPArchive::ReadOnlyDB</literal></para></listitem>
+     </varlistentry>   
+   
+     &apt-commonoptions;
+     
+   </variablelist>
+ </refsect1>
+
+<!--
+<refsect1><title>Examples</title>
+-->
+<refsect1><title>サンプル</title>
+
+<!--
+<para>To create a compressed Packages file for a directory containing
+binary packages (.deb):
+-->
+<para>バイナリパッケージ (.deb) があるディレクトリの 
+Packages ファイルを生成するには、以下のようにします。
+
+<programlisting>
+<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>
+</programlisting></para>
+
+</refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+   <para><command>apt-ftparchive</command> returns zero on normal operation, decimal 100 on error.</para>
+-->
+   <para><command>apt-ftparchive</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+ 
+</refentry>
diff --git a/doc/ja/apt-get.ja.8.sgml b/doc/ja/apt-get.ja.8.sgml
deleted file mode 100644
index 156f83699..000000000
--- a/doc/ja/apt-get.ja.8.sgml
+++ /dev/null
@@ -1,857 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.12 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-get</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-get</>
-<!--
-    <refpurpose>APT package handling utility - - command-line interface</>
--->
-    <refpurpose>APT �ѥå��������桼�ƥ���ƥ� -- ���ޥ�ɥ饤�󥤥󥿡��ե�����</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-get</>
-      <arg><option>-hvs</></arg>
-      <arg><option>-o=<replaceable/config string/</></arg>
-      <arg><option>-c=<replaceable/file/</></arg>
-      <group choice=req>
-         <arg>update</>
-         <arg>upgrade</>
-         <arg>dselect-upgrade</>
-         <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>check</>
-         <arg>clean</>
-         <arg>autoclean</>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title>����</>
-   <para>
-<!--
-   <command/apt-get/ is the command-line tool for handling packages, and may be 
-   considered the user's "back-end" to other tools using the APT library.
--->
-   <command/apt-get/ �ϥѥå����������륳�ޥ�ɥ饤��ġ���ǡ�
-   APT �饤�֥����Ѥ���¾�Υġ���Υ桼��¦�Хå�����ɤȤ⤤�����ΤǤ���
-   </para>
-   <para>
-<!--
-   Unless the <option/-h/, or <option/- -help/ option is given one of the
-   commands below must be present.
--->
-   <option/-h/ �� <option/--help/ ��������ʲ��˵󤲤륳�ޥ�ɤ�ɬ�פǤ���
-   </para>
-   <VariableList>
-     <VarListEntry><Term>update</Term>
-     <ListItem><Para>
-<!--
-     <literal/update/ is used to resynchronize the package index files from
-     their sources. The indexes of available packages are fetched from the
-     location(s) specified in <filename>/etc/apt/sources.list</>.
-     For example, when using a Debian archive, this command retrieves and
-     scans the <filename>Packages.gz</> files, so that information about new 
-     and updated packages is available. An <literal/update/ should always be 
-     performed before an <literal/upgrade/ or <literal/dist-upgrade/. Please 
-     be aware that the overall progress meter will be incorrect as the size 
-     of the package files cannot be known in advance.
--->
-     <literal/update/ �Ϥ��줾�����������ѥå���������ǥå����ե������
-     ��Ʊ����Ԥ��Τ˻��Ѥ��ޤ������Ѳ�ǽ�ʥѥå������Υ���ǥå����� 
-     <filename>/etc/apt/sources.list</> �˵��Ҥ�����꤫��������ޤ���
-     �㤨�� Debian archive �����Ѥ���ݡ����Υ��ޥ�ɤ� <filename>Packages.gz</> 
-     �ե�����򸡺����뤳�Ȥǡ������ޤ��Ϲ������줿�ѥå������ξ������Ѳ�ǽ
-     �Ȥʤ�ޤ���<literal/update/ �� <literal/upgrade/ �� 
-     <literal/dist-upgrade/ ��Ԥ����˾�˼¹Ԥ���٤��Ǥ���
-     ����äƥѥå������ե�����Υ��������Τ뤳�Ȥ��Ǥ��ʤ����ᡢ
-     ���ΤΥץ����쥹�᡼����������ɽ������ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><Term>upgrade</Term>
-     <ListItem><Para>   
-<!--
-     <literal/upgrade/ is used to install the newest versions of all packages 
-     currently installed on the system from the sources enumerated in
-     <filename>/etc/apt/sources.list</>. Packages currently installed with 
-     new versions available are retrieved and upgraded; under no circumstances 
-     are currently installed packages removed, or packages not already installed 
-     retrieved and installed. New versions of currently installed packages that 
-     cannot be upgraded without changing the install status of another package 
-     will be left at their current version. An <literal/update/ must be 
-     performed first so that <command/apt-get/ knows that new versions of packages are 
-     available.
--->
-     <literal/upgrade/ �ϡ����ߥ����ƥ�˥��󥹥ȡ��뤵��Ƥ������ѥå�������
-     �ǿ��С�������<filename>/etc/apt/sources.list</> ����󤷤�����������
-     ���󥹥ȡ��뤹��Τ˻��Ѥ��ޤ������ߥ��󥹥ȡ�����Υѥå������˿�����
-     �С�����󤬤���й������ޤ����������ʤ���⸽�ߥ��󥹥ȡ������
-     �ѥå������κ���ϹԤ��ޤ����оݤΥѥå�������
-     ¾�Υѥå������Υ��󥹥ȡ�����֤��ѹ������˹����Ǥ��ʤ����ϡ�
-     ���ߤΥС������ΤޤޤȤʤ�ޤ���
-     <literal/update/ ��Ϥ���˼¹Ԥ��Ƥ����ơ�<command/apt-get/ ��
-     �ѥå������ο������С���������ѤǤ��뤳�Ȥ��Τ餻��ɬ�פ�����ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>dselect-upgrade</Term>
-     <ListItem><Para>   
-<!--
-     is used in conjunction with the traditional Debian GNU/Linux packaging
-     front-end, &dselect;. <literal/dselect-upgrade/
-     follows the changes made by &dselect; to the <literal/Status/
-     field of available packages, and performs the actions necessary to realize
-     that state (for instance, the removal of old and the installation of new
-     packages). 
--->
-     ����Ū�� Debian GNU/Linux �ѥå����������ե���ȥ���ɤ� &dselect; 
-     �ȶ��˻��Ѥ���ޤ���<literal/dselect-upgrade/ �� &dselect; �Ǻ��줿
-     ���Ѳ�ǽ�ѥå������� <literal/Status/ �ե�����ɤ��ѹ������פ���
-     ���ξ��֤�ȿ�Ǥ�����Τ�ɬ�פʥ���������¹Ԥ��ޤ���
-     (�㤨�С��Ť��ѥå������κ���俷�����ѥå������Υ��󥹥ȡ���ʤ�) 
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>dist-upgrade</Term>
-     <ListItem><Para>   
-<!--
-     <literal/dist-upgrade/, in addition to performing the function of 
-     <literal/upgrade/, also intelligently handles changing dependencies 
-     with new versions of packages; <command/apt-get/ has a "smart" conflict 
-     resolution system, and it will attempt to upgrade the most important 
-     packages at the expense of less  important ones if necessary. 
-     The <filename>/etc/apt/sources.list</> file contains a list of locations 
-     from which to retrieve desired package files.
--->
-     <literal/dist-upgrade/ �� <literal/upgrade/ �ε�ǽ�˲ä������С�������
-     �ѥå��������Ф����¸�ط����ѹ�����Ū�����ޤ���
-     <command/apt-get/ �ϡ��������줿�׶����襷���ƥ�������ɬ�פʤ�
-     ���Ū���פǤʤ��ѥå����������ˤ��ơ��ǽ��ץѥå������ι�����
-     ��ߤޤ���
-     <filename>/etc/apt/sources.list</> �ե������ɬ�פʥѥå������ե������
-     ����������Υꥹ�Ȥ��ޤޤ�Ƥ��ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>install</Term>
-     <ListItem><Para>   
-<!--
-     <literal/install/ is followed by one or more packages desired for 
-     installation. Each package is a package name, not a fully qualified 
-     filename (for instance, in a Debian GNU/Linux system, libc6 would be the 
-     argument provided, not em(libc6_1.9.6-2.deb)). All packages required 
-     by the package(s) specified for installation will also be retrieved and 
-     installed. The <filename>/etc/apt/sources.list</> file is used to locate 
-     the desired packages. If a hyphen is appended to the package name (with 
-     no intervening space), the identified package will be removed if it is 
-     installed. Similarly a plus sign can be used to designate a package to 
-     install. These latter features may be used to override decisions made by 
-     apt-get's conflict resolution  system.
--->
-     <literal/install/ �θ�ˤϥ��󥹥ȡ��뤹��ѥå�������1�İʾ���ꤷ�ޤ���
-     ���ꤹ��ѥå������ϡ������ʥե�����̾�ǤϤʤ��ѥå�����̾�Ǥ���
-     (�㤨�� Debian GNU/Linux �����ƥ�Ǥ� libc6_1.9.6-2.deb �ǤϤʤ� libc6 ��
-     �����Ȥ���Ϳ���ޤ�) ���󥹥ȡ��뤹��褦���ꤷ�����٤ƤΥѥå��������Ф�
-     ���������󥹥ȡ����Ԥ��ޤ���<filename>/etc/apt/sources.list</> �ե�����
-     ���׵᤹��ѥå������ξ������ꤹ��Τ˻��Ѥ��ޤ���
-     �ѥå�����̾�θ���� (�����ޤޤ�) �ϥ��ե��ɲä���Ƥ����硢
-     ���Υѥå����������󥹥ȡ��뤵��Ƥ���к�����ޤ���
-     Ʊ�ͤˡ����󥹥ȡ��뤹��ѥå���������������Τ˥ץ饹�������ѤǤ��ޤ���
-     ����ʸ���� apt-get �ζ����襷���ƥ��Ƚ�Ǥ����Ѥ���뤫�⤷��ޤ���
-     </para>
-     <para>
-<!--
-     A specific version of a package can be selected for installation by 
-     following the package name with an equals and the version of the package 
-     to select. This will cause that version to be located and selected for
-     install. Alternatively a specific distribution can be selected by 
-     following the package name with a slash and the version of the 
-     distribution or the Archive name (stable, frozen, unstable).
--->
-     �ѥå������˥������뵭��ȥС�������³���뤳�Ȥǡ�
-     ���򤷤��С������Υѥå������򥤥󥹥ȡ��뤹�뤳�Ȥ��Ǥ��ޤ���
-     �Ĥޤ����ΥС������Υѥå������򥤥󥹥ȡ��뤹��褦������
-     ����Ȥ��������ȤǤ���
-     �̤���ˡ�Ȥ��Ƥϡ��ǥ����ȥ�ӥ塼���������ꤹ��Τˡ�
-     �ѥå�����̾�θ��³���ƥ���å���ȥǥ����ȥ�ӥ塼�����ΥС�������
-     ����������̾ (stable, frozen, unstable) �򵭽ҤǤ��ޤ��� 
-     </para>
-     <para>
-     �С���������򵡹��ϥ����󥰥졼�ɻ��ˤ���ѤǤ��뤿�ᡢ���դ�ʧ�ä�
-     ���Ѥ��ʤ���Фʤ�ޤ���
-     </para>
-     <para>
-<!--
-     If no package matches the given expression and the expression contains one
-     of '.', '?' or '*' then it is assumed to be a POSIX regex and it is applied
-     to all package names in the database. Any matches are then installed (or
-     removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
-     and 'lowest'. If this is undesired prefix with a '^' character.
--->
-     �⤷'.'��'?'��'*'��ޤ๽ʸ�˰�Ĥ�ѥå�����̾���ޥå����ʤ��ä���硢
-     POSIX ����ɽ���Ǥ���ȸ��ʤ����ǡ����١���������ѥå�����̾���Ф���
-     Ŭ�Ѥ��ޤ���
-     �ޥå������ѥå��������٤Ƥ����󥹥ȡ���(�⤷���Ϻ��)����ޤ���
-     ��) 'lo.*' �Τ褦��ʸ����� 'how-lo' �� 'lowest' �˥ޥå����ޤ���
-     �����˾�ޤʤ���С���Ƭ�� '^' ��Ĥ��Ƥ���������
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>remove</Term>
-     <ListItem><Para>   
-<!--
-     <literal/remove/ is identical to <literal/install/ except that packages are 
-     removed instead of installed. If a plus sign is appended to the package 
-     name (with no intervening space), the identified package will be 
-     installed.
--->
-     <literal/remove/ �� �ѥå��������������뤳�Ȥ������<literal/install/
-     ��Ʊ�ͤǤ���
-     �ץ饹���椬�ѥå�����̾�� (�֤˶����ޤޤ���) �ղä��줿��硢
-     ���̤��줿�ѥå������򥤥󥹥ȡ��뤷�ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>source</Term>
-     <ListItem><Para>
-<!--
-     <literal/source/ causes <command/apt-get/ to fetch source packages. APT 
-     will examine the available packages to decide which source package to 
-     fetch. It will then find and download into the current directory the 
-     newest available version of that source package. Source packages are 
-     tracked separately from binary packages via <literal/deb-src/ type lines 
-     in the &sources-list; file. This probably will mean that you will not 
-     get the same source as the package you have installed or as you could 
-     install. If the - -compile options is specified then the package will be 
-     compiled to a binary .deb using dpkg-buildpackage, if - -download-only is 
-     specified then the source package will not be unpacked.
--->
-     <literal/source/ �ϥ������ѥå��������������褦 <command/apt-get/ 
-     ���뤳�Ȥ��̣���ޤ���
-     APT �ϤɤΥ������ѥå�������������뤫���ꤹ��褦�����Ѳ�ǽ�ʥѥå�������
-     ��Ƥ���ޤ���
-     ���θ塢�ǿ������Ѳ�ǽ�ʥ������ѥå������򸫤Ĥ��������ȥǥ��쥯�ȥ��
-     ����������ɤ��ޤ���
-     �������ѥå������ϡ��Х��ʥ�ѥå������Ȥ��̤� &sources-list; �ե������
-     <literal/deb-src/ �Ԥ�����פ���ޤ���
-     ����ϡ����󥹥ȡ��뤷�� (�ޤ��ϥ��󥹥ȡ���Ǥ���) �ѥå������ȡ�
-     ���������Ѥ��뤳�Ȥ��Ǥ��뤳�Ȥ򼨤��Ƥ��ޤ���
-     --compile ���ץ���󤬻��ꤵ�줿��硢dpkg-buildpackage ���Ѥ���
-     �Х��ʥ� .deb �ե�����إ���ѥ����Ԥ��ޤ���
-     --download-only �ξ��ϥ������ѥå�������Ÿ�����ޤ���
-     </para>
-     <para>
-<!--
-     A specific source version can be retrieved by postfixing the source name
-     with an equals and then the version to fetch, similar to the mechanism
-     used for the package files. This enables exact matching of the source 
-     package name and version, implicitly enabling the 
-     <literal/APT::Get::Only-Source/ option.
--->
-     �ѥå�������Ʊ�ͤˡ�������̾�θ���˥�������ȼ����������С�������
-     �֤����Ȥǡ����ꤷ���С������Υ����������뤳�Ȥ��Ǥ��ޤ���
-     <literal/APT::Get::Only-Source/ ���ץ����ǰ��ۤΤ�����ͭ���ˤʤä�
-     ���뤿�ᡢ�������ѥå�����̾�ȥС������˸�̩�˥ޥå��󥰤���褦��
-     �ʤäƤ��ޤ���
-     </para>
-     
-     <para>
-<!--
-     Note that source packages are not tracked like binary packages, they 
-     exist only in the current directory and are similar to downloading source
-     tar balls.
--->
-     ��) tar ball �ϥ����ȥǥ��쥯�ȥ�ˤΤߥ���������ɤ��졢
-     �����ȥǥ��쥯�ȥ��Ÿ������ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>build-dep</Term>
-     <ListItem><Para>   
-<!--
-     <literal/build-dep/ causes apt-get to install/remove packages in an 
-     attempt to satisfy the build dependencies for a source packages. 
--->
-     <literal/build-dep/ �ϥ������ѥå������ι��۰�¸�ط����������褦�ˡ�
-     �ѥå������Υ��󥹥ȡ��롦�����Ԥ��ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>check</Term>
-     <ListItem><Para>   
-<!--
-     <literal/check/ is a diagnostic tool; it updates the package cache and checks 
-     for broken dependencies.
--->
-     <literal/check/ �ϡ��ѥå���������å���ι�������줿��¸�ط�������å�����
-     ���ǥġ���Ǥ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>clean</Term>
-     <ListItem><Para>
-<!--   
-     <literal/clean/ clears out the local repository of retrieved package 
-     files. It removes everything but the lock file from 
-     <filename>&cachedir;/archives/</> and 
-     <filename>&cachedir;/archive/partial/</>. When APT is used as a 
-     &dselect; method, <literal/clean/ is run automatically.
-     Those who do not use dselect will likely want to run <literal/apt-get clean/
-     from time to time to free up disk space.
- -->
-     <literal/clean/ �ϼ��������ѥå������Υ��������ݥ��ȥ���ݽ����ޤ���
-     <filename>&cachedir;/archives/</> �� 
-     <filename>&cachedir;/archive/partial/</> ����
-     ���å��ե�����ʳ����٤ƺ�����ޤ���
-     APT �� &dselect; ����ƤФ��Ȥ��ˤϡ���ưŪ�� <literal/clean/ ��
-     �¹Ԥ���ޤ���
-     dselect����Ѥ��ʤ����ϡ��ǥ��������ڡ�����������뤿�ᡢ���� 
-     <literal/apt-get clean/ ��¹Ԥ������ʤ�Ǥ��礦��
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><Term>autoclean</Term>
-     <ListItem><Para>   
-<!--
-     Like <literal/clean/, <literal/autoclean/ clears out the local 
-     repository of retrieved package files. The difference is that it only 
-     removes package files that can no longer be downloaded, and are largely 
-     useless. This allows a cache to be maintained over a long period without 
-     it growing out of control. The configuration option 
-     <literal/APT::Clean-Installed/ will prevent installed packages from being
-     erased if it is set off.
--->
-     <literal/clean/ Ʊ�͡�<literal/autoclean/ �ϼ��������ѥå������Υ�������
-     ��ݥ��ȥ���ݽ����ޤ����㤤�ϡ��⤦����������ɤ���뤳�Ȥ��ʤ�
-     �ѥå������ե�����䡢�ۤȤ�����פʥѥå������ե�����Τߤ������뤳�ȤǤ���
-     ���Τ��ᡢĹ�����֡�����å��夬�����Ǥ��������粽���뤳�Ȥʤ���
-     �ݻ����뤳�Ȥ��Ǥ��ޤ���
-     ���ꥪ�ץ���� <literal/APT::Clean-Installed/ �� off �����åȤ��Ƥ���С�
-     ���󥹥ȡ���ѤΥѥå������ե����뤬��������Τ��ɤ����Ȥ��Ǥ��ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
- 
- <RefSect1><Title>���ץ����</>
-   &apt-cmdblurb;
-
-   <VariableList>
-     <VarListEntry><term><option/-d/</><term><option/--download-only/</>
-     <ListItem><Para>
-<!--
-     Download only; package files are only retrieved, not unpacked or installed.
-     Configuration Item: <literal/APT::Get::Download-Only/.
--->
-     ����������ɤΤ� - �ѥå������ե�����μ����Τߤ�Ԥ���
-     Ÿ�������󥹥ȡ����Ԥ��ޤ���
-     ������� - <literal/APT::Get::Download-Only/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-f/</><term><option/--fix-broken/</>
-     <ListItem><Para>
-<!--
-     Fix; attempt to correct a system with broken dependencies in            
-     place. This option, when used with install/remove, can omit any packages
-     to permit APT to deduce a likely soltion. Any Package that are specified
-     must completly correct the problem. The option is sometimes necessary when 
-     running APT for the first time; APT itself does not allow broken package 
-     dependencies to exist on a system. It is possible that a system's 
-     dependency structure can be so corrupt as to require manual intervention 
-     (which usually means using &dselect; or <command/dpkg - -remove/ to eliminate some of 
-     the offending packages). Use of this option together with <option/-m/ may produce an
-     error in some situations. 
-     Configuration Item: <literal/APT::Get::Fix-Broken/.
--->
-     ���� - ��¸�ط������줿�����ƥ�ν������ߤޤ���
-     ���Υ��ץ����� install �� remove �Ȱ��˻Ȥ��Ȥ��ϡ��ѥå�������
-     ���ꤷ�ʤ��Ƥ⤫�ޤ��ޤ��󡣤ɤΥѥå���������ꤷ�Ƥ⡢�����������
-     ��褷�ޤ�
-     APT ���Τϥ����ƥ��¸�ߤ�����줿�ѥå�������¸�ط���������Ȥ��Ǥ��ʤ�
-     �Τǡ����� APT ��¹Ԥ����硢���Υ��ץ����ɬ�פˤʤ뤳�Ȥ�����ޤ���
-     �����ƥ�ΰ�¸�ط���¤�ˤ��ʤ����꤬������ϡ���ư�ǽ�������褦
-     �׵᤹�뤳�Ȥ��������ޤ���
-     (�̾�ϡ�����Τ���ѥå�������������Τ�&dselect; ��
-      <command/dpkg --remove/ ����Ѥ��ޤ�)
-     ���Υ��ץ����� <option/-m/ ���ץ�����Ʊ���˻��Ѥ���ȡ�
-     ��������Ǥϥ��顼�ˤʤ뤫�⤷��ޤ���
-     ������� - <literal/APT::Get::Fix-Broken/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-m/</><term><option/--ignore-missing/</>
-                   <term><option/--fix-missing/</>
-     <ListItem><Para>
-<!--
-     Ignore missing packages; If packages cannot be retrieved or fail the    
-     integrity check after retrieval (corrupted package files), hold back    
-     those packages and handle the result. Use of this option together with  
-     <option/-f/ may produce an error in some situations. If a package is 
-     selected for installation (particularly if it is mentioned on the 
-     command line) and it could not be downloaded then it will be silently 
-     held back.
-     Configuration Item: <literal/APT::Get::Fix-Missing/.
--->
-     ����ѥå�������̵�� - �ѥå������������Ǥ��ʤ��ä��ꡢ
-     (�ѥå���������»��) ����������������������å����̤�ʤ��ä���硢
-     ���Υѥå������ν�������α���Ǹ�ޤǽ�����³���ޤ���
-     ���Υ��ץ����� <option/-f/ ���ץ�����Ʊ���˻��Ѥ���ȡ�
-     ��������Ǥϥ��顼�ˤʤ뤫�⤷��ޤ���
-     �ѥå������򥤥󥹥ȡ��뤹��褦���򤷤Ƥ����� 
-     (�ä˥��ޥ�ɥ饤��Ǥ�����) �䡢����������ɤǤ��ʤ��ä�����
-     �ʤˤ�ɽ��������α���뤳�Ȥˤʤ�ޤ���
-     ������� - <literal/APT::Get::Fix-Missing/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--no-download/</>
-     <ListItem><Para>
-<!--
-     Disables downloading of packages. This is best used with 
-     <option/- -ignore-missing/ to force APT to use only the .debs it has 
-     already downloaded.
-     Configuration Item: <literal/APT::Get::Download/.
--->
-     �ѥå������Υ���������ɤ򤵤��ޤ��󡣤���Ϥ��Ǥ˥���������ɤ��� .deb 
-     ���Ф��ƤΤ�APT��Ԥ��ݤˡ�<option/--ignore-missing/ ��ʻ����
-     �Ȥ��Τ��褤�Ǥ��礦��
-     ������� - <literal/APT::Get::Download/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-q/</><term><option/--quiet/</>
-     <ListItem><Para>
-<!--
-     Quiet; produces output suitable for logging, omitting progress indicators.
-     More q's will produce more quiet up to a maximum of 2. You can also use
-     <option/-q=#/ to set the quiet level, overriding the configuration file. 
-     Note that quiet level 2 implies <option/-y/, you should never use -qq 
-     without a no-action modifier such as -d, - -print-uris or -s as APT may 
-     decided to do something you did not expect.
-     Configuration Item: <literal/quiet/.
--->
-     �Ų� - ��Ľɽ�����ά���ƥ�����Ȥ�Τ������ʽ��Ϥ�Ԥ��ޤ���
-     ���� 2 �Ĥޤ� q ��Ťͤ뤳�ȤǤ���Ť��ˤǤ��ޤ���
-     �ޤ���<option/-q=#/ �Τ褦���Ų���٥����ꤷ�ơ�����ե������
-     ��񤭤��뤳�Ȥ�Ǥ��ޤ���
-     ��) �Ų���٥� 2 �� <option/-y/ �ΰ�̣��ޤ�Ǥ��ޤ���
-     APT ���տޤ��ʤ������Ԥ����⤷��ʤ��Τ� -d, --print-uris, -s �Τ褦��
-     ����Ԥ�ʤ����ץ�����Ĥ����� -qq ����Ѥ���٤��ǤϤ���ޤ���
-     ������� - <literal/quiet/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-s/</>
-                   <term><option/--simulate/</>
-		   <term><option/--just-print/</>
-		   <term><option/--dry-run/</>
-		   <term><option/--recon/</>
-		   <term><option/--no-act/</>
-     <ListItem><Para>
-<!--
-     No action; perform a simulation of events that would occur but do not
-     actually change the system. 
-     Configuration Item: <literal/APT::Get::Simulate/.
--->
-     ư��ʤ� - �ʤˤ�������Τ��Υ��ߥ�졼������Ԥ���
-     �ºݤΥ����ƥ��ѹ��Ϥ��ޤ���
-     ������� - <literal/APT::Get::Simulate/
-     </para>
-     <para>
-<!--
-     Simulate prints out
-     a series of lines each one representing a dpkg operation, Configure (Conf),
-     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
-     and empty set of square brackets meaning breaks that are of no consequence
-     (rare).
--->
-     ���ߥ�졼�Ȥη�̡�dpkg ��ư���ɽ����Ϣ�ιԤΤ��줾��ˡ����� (Conf)��
-     ��� (Remv)�� Ÿ�� (Inst) ��ɽ�����ޤ���
-     �ѥ��å��ϲ��줿�ѥå�������ɽ�������γѥ��å����礷������ǤϤʤ����Ȥ�
-     ɽ���ޤ�(�ޤ�Ǥ�)��
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-y/</><term><option/--yes/</>
-                   <term><option/--assume-yes/</>
-     <ListItem><Para>
-<!--
-     Automatic yes to prompts; assume "yes" as answer to all prompts and run
-     non-interactively. If an undesirable situation, such as changing a held
-     package or removing an essential package occurs then <literal/apt-get/ 
-     will abort. 
-     Configuration Item: <literal/APT::Get::Assume-Yes/.
--->
-     �ץ���ץȤؤμ�ư���� - ���٤ƤΥץ���ץȤ˼�ưŪ�� "yes" ��������
-     ������Ū�˼¹Ԥ��ޤ���
-     ��α�����ѥå������ξ��֤��ѹ������ꡢɬ�ܥѥå�������������褦����Ŭ�ڤʾ����ξ�硢
-     <literal/apt-get/ �����Ǥ���Ǥ��礦��
-     ������� - <literal/APT::Get::Assume-Yes/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</>
-     <ListItem><Para>
-<!--
-     Show upgraded packages; Print out a list of all packages that are to be
-     upgraded. 
-     Configuration Item: <literal/APT::Get::Show-Upgraded/.
--->
-     �����ѥå�����ɽ�� - ������������ѥå������ΰ�����ɽ�����ޤ���
-     ������� - <literal/APT::Get::Show-Upgraded/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-b/</><term><option/--compile/</>
-                   <term><option/--build/</>
-     <ListItem><Para>
-<!--
-     Compile source packages after downloading them.
-     Configuration Item: <literal/APT::Get::Compile/.
--->
-     �������ѥå����������������ɸ塢����ѥ��뤷�ޤ���
-     ������� - <literal/APT::Get::Compile/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--ignore-hold/</>
-     <ListItem><Para>
-<!--
-     Ignore package Holds; This causes <command/apt-get/ to ignore a hold 
-     placed on a package. This may be useful in conjunction with 
-     <literal/dist-upgrade/ to override a large number of undesired holds. 
-     Configuration Item: <literal/APT::Ignore-Hold/.
--->
-    ��α�ѥå�����̵�� - �ѥå���������α�ؼ���̵�뤷�� <command/apt-get/ 
-    ��Ԥ��ޤ���
-    ���̤Υѥå���������α�β���򤹤�Τ� <literal/dist-upgrade/ �ȶ���
-    ���Ѥ���������Ǥ���
-    ������� - <literal/APT::Ignore-Hold/
-    </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--no-upgrade/</>
-     <ListItem><Para>
-<!--
-     Do not upgrade packages; When used in conjunction with <literal/install/
-     <literal/no-upgrade/ will prevent packages listed from being upgraded
-     if they are already installed. 
-     Configuration Item: <literal/APT::Get::Upgrade/.
--->
-     �ѥå����������ʤ� -  <literal/install/ ��Ʊ���˻��Ѥ���ȡ�
-     <literal/no-upgrade/ �ϻ��ꤷ���ѥå����������Ǥ˥��󥹥ȡ��뤷�Ƥ�����
-     ������Ԥ��ޤ���
-     ������� - <literal/APT::Get::Upgrade/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--force-yes/</>
-     <ListItem><Para>
-<!--
-     Force yes; This is a dangerous option that will cause apt to continue 
-     without prompting if it is doing something potentially harmful. It 
-     should not be used except in very special situations. Using 
-     <literal/force-yes/ can potentially destroy your system! 
-     Configuration Item: <literal/APT::Get::force-yes/.
--->
-     �������� - APT ������»����Ϳ�����ͤʤ�ư��򤷤褦�Ȥ������Ǥ⡢
-     ��ǧ�����Ϥʤ��Ǽ¹Ԥ��Ƥ��ޤ��������ʥ��ץ����Ǥ���
-     ��ۤɤξ����Ǥʤ���С����Ѥ��ʤ����������Ǥ��礦��
-     <literal/force-yes/ �Ϥ��ʤ��Υ����ƥ���˲������ͤޤ���!
-     ������� - <literal/APT::Get::force-yes/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--print-uris/</>
-     <ListItem><Para>
-<!--
-     Instead of fetching the files to install their URIs are printed. Each
-     URI will have the path, the destination file name, the size and the expected
-     md5 hash. Note that the file name to write to will not always match
-     the file name on the remote site! This also works with the 
-     <literal/source/ and <literal/update/ commands. When used with the
-     <literal/update/ command the MD5 and size are not included, and it is
-     up to the user to decompress any compressed files.
-     Configuration Item: <literal/APT::Get::Print-URIs/.
--->
-     ���󥹥ȡ��뤹��ե�����������������ˡ�����URI��ɽ�����ޤ���
-     URI�ˤϡ��ѥ����оݥե�����̾���ե����륵������ͽ¬����� md5 �ϥå���
-     ���ޤޤ�Ƥ��ޤ���
-     ��) ���Ϥ����ե�����̾������˥�⡼�ȥ����ȤΥե�����̾�Ȱ��פ���櫓
-     �ǤϤ���ޤ���! ����� <literal/source/ ���ޥ�ɡ� <literal/update/ 
-     ���ޥ�ɤǤ�ư��ޤ���
-     MD5 ��ե����륵������ޤޤ� <literal/update/ �ǻ��Ѥ����Ȥ��ˡ�
-     ���̥ե������Ÿ�����뤳�Ȥϥ桼������Ǥ�ˤ����ƹԤäƤ���������
-     ������� - <literal/APT::Get::Print-URIs/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--purge/</>
-     <ListItem><Para>
-<!--
-     Use purge instead of remove for anything that would be removed.
-     Configuration Item: <literal/APT::Get::Purge/.
--->
-     ��������硢����ǤϤʤ������������Ѥ��ޤ���
-     ������� - <literal/APT::Get::Purge/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--reinstall/</>
-     <ListItem><Para>
-<!--
-     Re-Install packages that are already installed and at the newest version.
-     Configuration Item: <literal/APT::Get::ReInstall/.
--->
-     ���Ǥ˺ǿ��Ǥ����󥹥ȡ��뤵��Ƥ��Ƥ⡢�ѥå�������ƥ��󥹥ȡ��뤷�ޤ���
-     ������� - <literal/APT::Get::ReInstall/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--list-cleanup/</>
-     <ListItem><Para>
-<!--
-     This option defaults to on, use <literal/- -no-list-cleanup/ to turn it 
-     off. When on <command/apt-get/ will automatically manage the contents of 
-     <filename>&statedir;/lists</> to ensure that obsolete files are erased. 
-     The only  reason to turn it off is if you frequently change your source 
-     list. 
-     Configuration Item: <literal/APT::Get::List-Cleanup/.
--->
-     ���ε�ǽ�ϥǥե���Ȥ� ON �ˤʤäƤ��ޤ���
-     OFF �ˤ���ˤ� <literal/--no-list-cleanup/ �Ȥ��Ƥ���������
-     ON �ξ�硢<command/apt-get/ �ϸŤ��ʤä��ե������μ¤˾õ�뤿�ᡢ
-     ��ưŪ�� <filename>&statedir;/lists</> ����Ȥ��������Ǥ��礦��
-     ����� OFF �ˤ���Τϡ����ʤ����������ꥹ�Ȥ����ˤ��ѹ���������餤�Ǥ���
-     ������� - <literal/APT::Get::List-Cleanup/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-t/</>
-                   <term><option/--target-release/</>
-                   <term><option/--default-release/</>
-     <ListItem><Para>
-<!--
-     This option controls the default input to the policy engine, it creates
-     a default pin at priority 990 using the specified release string. The
-     preferences file may further override this setting. In short, this option
-     lets you have simple control over which distribution packages will be
-     retrieved from. Some common examples might be 
-     <option>-t '2.1*'</> or <option>-t unstable</>.
-     Configuration Item: <literal/APT::Default-Release/
--->
-     ���Υ��ץ����ϥݥꥷ�����󥸥�ؤΥǥե�������Ϥ����椷�ޤ���
-     ����ϡ����ꤵ�줿��꡼��ʸ�������Ѥ����ǥե���� pin ��ͥ���� 990 
-     �Ǻ������뤳�ȤǤ���
-     ͥ��ե�����Ϥ���������񤭤��ޤ���
-     �פ���ˤ��Υ��ץ����ϡ��ɤ����ۥѥå�������������뤫���ñ��
-     �������Ƥ��ޤ���
-     �����Ĥ�����Ū����ϡ�<option>-t '2.1*'</> �� <option>-t unstable</> 
-     �Ǥ��礦��
-     ������� - <literal/APT::Default-Release/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--trivial-only/</>
-     <ListItem><Para>
-<!--
-     Only perform operations that are 'trivial'. Logically this can be considered
-     related to <option/- -assume-yes/, where <option/- -assume-yes/ will answer 
-     yes to any prompt, <option/- -trivial-only/ will answer no. 
-     Configuration Item: <literal/APT::Get::Trivial-Only/.
--->
-     �ֽ��פǤʤ������Τߤ�Ԥ��ޤ������������Ū�� <option/--assume-yes/ ��
-     ��֤ȸ��ʤ����Ȥ��Ǥ��ޤ���<option/--assume-yes/ �ϼ���ˤ��٤� yes ��
-     �����ޤ�����<option/--trivial-only/ �Ϥ��٤� no �������ޤ���
-     ������� - <literal/APT::Get::Trivial-Only/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--no-remove/</>
-     <ListItem><Para>
-<!--
-     If any packages are to be removed apt-get immediately aborts without
-     prompting. 
-     Configuration Item: <literal/APT::Get::Remove/
--->
-     �ѥå�������������������ˤʤä��Ȥ����ץ���ץȤ�ɽ���������Ǥ��ޤ���
-     ������� - <literal/APT::Get::Remove/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--only-source/</>
-     <ListItem><Para>
-<!--
-     Only has meaning for the <literal/source/ command. indicates that the
-     given source names are not to be mapped through the binary table.
-     Configuration Item: <literal/APT::Get::Only-Source/
--->
-     <literal/source/ ���ޥ�ɤǤΤ߰�̣������ޤ���
-     ���ꤵ�줿������̾���Х��ʥ�ơ��֥�˥ޥåפ���ʤ����Ȥ򼨤��ޤ���
-     ������� - <literal/APT::Get::Only-Source/
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/--diff-only/</><term><option/--tar-only/</>
-     <ListItem><Para>
-<!--
-     Download only the diff or tar file of a source archive. 
-     Configuration Item: <literal/APT::Get::Diff-Only/ and 
-     <literal/APT::Get::Tar-Only/
--->
-     ���������������֤� diff �ե������ tar �ե�����Υ���������ɤΤߤ�Ԥ��ޤ���
-     ������� - <literal/APT::Get::Diff-Only/ �� <literal/APT::Get::Tar-Only/
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><option/--arch-only/</>
-     <ListItem><Para>
-<!--
-     Only process architecture-dependent build-dependencies.
-     Configuration Item: <literal/APT::Get::Arch-Only/ 
--->
-     ���۰�¸�ط��β��򥢡����ƥ�����˰�¸������ΤΤ߹Ԥ��ޤ���
-     ������� - <literal/APT::Get::Arch-Only/ 
-     </Para></ListItem>
-     </VarListEntry>
-     
-      &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>�ե�����</>
-   <variablelist>
-     <VarListEntry><term><filename>/etc/apt/sources.list</></term>
-     <ListItem><Para>
-<!--
-     locations to fetch packages from.
-     Configuration Item: <literal/Dir::Etc::SourceList/.
--->
-     �ѥå������μ�������
-     ������� - <literal/Dir::Etc::SourceList/
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>/etc/apt/apt.conf</></term>
-     <ListItem><Para>
-<!--
-     APT configuration file.
-     Configuration Item: <literal/Dir::Etc::Main/.
--->
-     APT ����ե����롣
-     ������� - <literal/Dir::Etc::Main/
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>/etc/apt/apt.conf.d/</></term>
-     <ListItem><Para>
-<!--
-     APT configuration file fragments
-     Configuration Item: <literal/Dir::Etc::Parts/.
--->
-     APT ����ե���������ҡ�
-     ������� - <literal/Dir::Etc::Parts/
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>/etc/apt/preferences</></term>
-     <ListItem><Para>
-<!--
-     version preferences file
-     Configuration Item: <literal/Dir::Etc::Preferences/.
--->
-     �С������ͥ��ե����롣
-     ������� - <literal/Dir::Etc::Preferences/
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&cachedir;/archives/</></term>
-     <ListItem><Para>
-<!--
-     storage area for retrieved package files.
-     Configuration Item: <literal/Dir::Cache::Archives/.
--->
-     �����Ѥߥѥå������ե������Ǽ���ꥢ��
-     ������� - <literal/Dir::Cache::Archives/
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&cachedir;/archives/partial/</></term>
-     <ListItem><Para>
-<!--
-     storage area for package files in transit.
-     Configuration Item: <literal/Dir::Cache::Archives/ (implicit partial). 
--->
-     ������ѥå������ե������Ǽ���ꥢ��
-     ������� - <literal/Dir::Cache::Archives/ (ɬ��Ū���Դ����Ǥ�)
-     </Para></ListItem>
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&statedir;/lists/</></term>
-     <ListItem><Para>
-<!--
-     storage area for state information for each package resource specified in
-     &sources-list;
-     Configuration Item: <literal/Dir::State::Lists/.
--->
-     &sources-list; �Υѥå���������ͭ�ξ��־����Ǽ���ꥢ��
-     ������� - <literal/Dir::State::Lists/
-     </Para></ListItem>
-     </VarListEntry>
-  
-     <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
-     <ListItem><Para>
-<!--
-     storage area for state information in transit.
-     Configuration Item: <literal/Dir::State::Lists/ (implicit partial).
--->
-     ������ξ��־����Ǽ���ꥢ��
-     ������� - <literal/Dir::State::Lists/ (ɬ��Ū���Դ����Ǥ�)
-     </Para></ListItem>
-     </VarListEntry>     
-   </variablelist>
- </RefSect1>
-
- <RefSect1><Title>��Ϣ����</>
-   <para>
-   &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, 
-   &docdir;�� APT �桼������������, &apt-preferences;
-   </para>
- </RefSect1>
-
- <RefSect1><Title>���ǥ�å�����</>
-   <para>
-   <command/apt-get/ �����ｪλ���� 0 ���֤��ޤ���
-   ���顼���ˤϽ��ʤ� 100 ���֤��ޤ���
-   </para>
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator; 
-</refentry>
diff --git a/doc/ja/apt-get.ja.8.xml b/doc/ja/apt-get.ja.8.xml
new file mode 100644
index 000000000..f503b89ef
--- /dev/null
+++ b/doc/ja/apt-get.ja.8.xml
@@ -0,0 +1,900 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+  
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-get</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-get</refname>
+<!--
+    <refpurpose>APT package handling utility -\- command-line interface</refpurpose>
+-->
+    <refpurpose>APT package handling utility -- コマンドラインインターフェース</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-get</command>
+      <arg><option>-hvs</option></arg>
+      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-c=<replaceable>file</replaceable></option></arg>
+      <group choice="req">
+         <arg>update</arg>
+         <arg>upgrade</arg>
+         <arg>dselect-upgrade</arg>
+         <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>check</arg>
+         <arg>clean</arg>
+         <arg>autoclean</arg>
+      </group>   
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-get</command> is the command-line tool for handling packages, and may be 
+   considered the user's "back-end" to other tools using the APT
+   library.  Several "front-end" interfaces exist, such as dselect(8),
+   aptitude, synaptic, gnome-apt and wajig.</para>
+-->
+   <para><command>apt-get</command> は、
+   パッケージを操作するコマンドラインツールで、
+   APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。
+   「フロントエンド」インターフェースには、dselect(8),
+   aptitude, synaptic, gnome-apt, wajig などがあります。</para>
+
+<!--
+   <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given, one of the
+   commands below must be present.</para>
+-->
+   <para><option>-h</option> オプションや <option>--help</option> オプションを除き、
+   以下に挙げるコマンドが必要です。</para>
+   
+   <variablelist>
+     <varlistentry><term>update</term>
+<!--
+     <listitem><para><literal>update</literal> is used to resynchronize the package index files from
+     their sources. The indexes of available packages are fetched from the
+     location(s) specified in <filename>/etc/apt/sources.list</filename>.
+     For example, when using a Debian archive, this command retrieves and
+     scans the <filename>Packages.gz</filename> files, so that information about new 
+     and updated packages is available. An <literal>update</literal> should always be 
+     performed before an <literal>upgrade</literal> or <literal>dist-upgrade</literal>. Please 
+     be aware that the overall progress meter will be incorrect as the size 
+     of the package files cannot be known in advance.</para></listitem>
+-->
+     <listitem><para><literal>update</literal>は、
+     取得元からパッケージインデックスファイルの再同期を行うのに使用します。
+     利用可能なパッケージのインデックスは、
+     <filename>/etc/apt/sources.list</filename> に記述した場所から取得します。
+     例えば Debian アーカイブを利用する際、
+     このコマンドが <filename>Packages.gz</filename> ファイルを検索することで、
+     新規または更新されたパッケージの情報が利用可能となります。
+     <literal>update</literal> は、<literal>upgrade</literal> や 
+     <literal>dist-upgrade</literal> を行う前に常に実行してください。
+     前もってパッケージファイルのサイズを知ることができないため、
+     全体の進捗メータは正しく表示されません。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>upgrade</term>
+<!--
+     <listitem><para><literal>upgrade</literal> is used to install the newest versions of all packages 
+     currently installed on the system from the sources enumerated in
+     <filename>/etc/apt/sources.list</filename>. Packages currently installed with 
+     new versions available are retrieved and upgraded; under no circumstances 
+     are currently installed packages removed, or packages not already installed 
+     retrieved and installed. New versions of currently installed packages that 
+     cannot be upgraded without changing the install status of another package 
+     will be left at their current version. An <literal>update</literal> must be 
+     performed first so that <command>apt-get</command> knows that new versions of packages are 
+     available.</para></listitem>
+-->
+     <listitem><para><literal>upgrade</literal> は、
+     現在システムにインストールされている全パッケージの最新バージョンを、
+     <filename>/etc/apt/sources.list</filename> 
+     に列挙した取得元からインストールするのに使用します。
+     現在インストール中のパッケージに新しいバージョンがあれば更新しますが、
+     いかなる時も現在インストール中のパッケージの削除は行いません。
+     対象のパッケージが、
+     他のパッケージのインストール状態を変更せずに更新できない場合は、
+     現在のバージョンのままとなります。
+     最初に <literal>update</literal> を実行しておき、
+     <command>apt-get</command> にパッケージの新しいバージョンがあることを
+     知らせる必要があります。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>dselect-upgrade</term>
+<!--
+     <listitem><para><literal>dselect-upgrade</literal>
+     is used in conjunction with the traditional Debian packaging
+     front-end, &dselect;. <literal>dselect-upgrade</literal>
+     follows the changes made by &dselect; to the <literal>Status</literal>
+     field of available packages, and performs the actions necessary to realize
+     that state (for instance, the removal of old and the installation of new
+     packages).</para></listitem>
+-->
+     <listitem><para><literal>dselect-upgrade</literal> は、
+     伝統的な Debian GNU/Linux パッケージ管理フロントエンドの &dselect; 
+     と共に使用されます。
+     <literal>dselect-upgrade</literal> は、
+     &dselect; で作られた利用可能パッケージの
+     <literal>Status</literal> フィールドの変更を追跡し、
+     その状態を反映させるのに必要なアクションを実行します。
+     (例えば、古いパッケージの削除や新しいパッケージのインストールなど) </para></listitem>
+
+     </varlistentry>
+
+     <varlistentry><term>dist-upgrade</term>
+<!--
+     <listitem><para><literal>dist-upgrade</literal> in addition to performing the function of 
+     <literal>upgrade</literal>, also intelligently handles changing dependencies 
+     with new versions of packages; <command>apt-get</command> has a "smart" conflict 
+     resolution system, and it will attempt to upgrade the most important 
+     packages at the expense of less important ones if necessary. 
+     The <filename>/etc/apt/sources.list</filename> file contains a list of locations 
+     from which to retrieve desired package files.
+     See also &apt-preferences; for a mechanism for
+     overriding the general settings for individual packages.</para></listitem>
+-->
+     <listitem><para><literal>dist-upgrade</literal> は、
+     <literal>upgrade</literal> の機能に加え、
+     新バージョンのパッケージに対する依存関係の変更を知的に操作します。
+     <command>apt-get</command> は「洗練された」競合解決システムを持ち、
+     必要とあらば比較的重要でないパッケージを犠牲にして、
+     最重要パッケージの更新を試みます。
+     <filename>/etc/apt/sources.list</filename> ファイルには、
+     必要なパッケージファイルを検索する場所のリストが含まれています。
+     特定のパッケージ向けに、一般的な設定を上書きする機構については、
+     &apt-preferences; をご覧ください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>install</term>
+<!--
+     <listitem><para><literal>install</literal> is followed by one or more packages desired for 
+     installation. Each package is a package name, not a fully qualified 
+     filename (for instance, in a Debian GNU/Linux system, libc6 would be the 
+     argument provided, not <literal>libc6_1.9.6-2.deb</literal>) All packages required 
+     by the package(s) specified for installation will also be retrieved and 
+     installed. The <filename>/etc/apt/sources.list</filename> file is used to locate 
+     the desired packages. If a hyphen is appended to the package name (with 
+     no intervening space), the identified package will be removed if it is 
+     installed. Similarly a plus sign can be used to designate a package to 
+     install. These latter features may be used to override decisions made by 
+     apt-get's conflict resolution system.</para>
+-->
+     <listitem><para><literal>install</literal> の後には、
+     インストールするパッケージを 1 つ以上指定します。
+     指定するパッケージは、完全なファイル名ではなくパッケージ名です。
+     (例えば Debian GNU/Linux システムでは、
+     <literal>libc6_1.9.6-2.deb</literal> ではなく libc6 を引数として与えます)
+     インストールするよう指定したすべてのパッケージに対し、
+     検索・インストールを行います。
+     <filename>/etc/apt/sources.list</filename> ファイルを、
+     要求するパッケージの場所を特定するのに使用します。
+     パッケージ名の後ろに (空白を含まず) ハイフンが追加されている場合、
+     そのパッケージがインストールされていれば削除します。
+     同様に、インストールするパッケージを明示するのにプラス記号も使用できます。
+     この記号は apt-get の競合解決システムの判断に利用されるかもしれません。</para>
+
+<!--
+     <para>A specific version of a package can be selected for installation by 
+     following the package name with an equals and the version of the package 
+     to select. This will cause that version to be located and selected for
+     install. Alternatively a specific distribution can be selected by 
+     following the package name with a slash and the version of the 
+     distribution or the Archive name (stable, testing, unstable).</para>
+-->
+     <para>パッケージにイコール記号とバージョンを続けることで、
+     選択したバージョンのパッケージをインストールすることができます。
+     つまり、指定のバージョンのパッケージをインストールするように選択する、
+     ということです。
+     別の方法としては、ディストリビューションを特定するのに、
+     パッケージ名に続けて、
+     スラッシュとディストリビューションのバージョンやアーカイブ名
+     (stable, testing, unstable) を記述できます。</para>
+
+<!--
+     <para>Both of the version selection mechanisms can downgrade packages and must
+     be used with care.</para>
+-->
+     <para>バージョン選択機構はダウングレード時にも使用できるため、
+     注意して使用しなければなりません。</para>
+
+<!--
+     <para>Finally, the &apt-preferences; mechanism allows you to
+     create an alternative installation policy for
+     individual packages.</para>
+-->
+     <para>最後に、&apt-preferences; 機構により、
+     特定のパッケージに対するインストールポリシーを作成できます。</para>
+
+<!--
+     <para>If no package matches the given expression and the expression contains one
+     of '.', '?' or '*' then it is assumed to be a POSIX regular expression,
+     and it is applied
+     to all package names in the database. Any matches are then installed (or
+     removed). Note that matching is done by substring so 'lo.*' matches 'how-lo'
+     and 'lowest'. If this is undesired, anchor the regular expression
+     with a '^' or '$' character, or create a more specific regular expression.</para></listitem>
+-->
+     <para>構文に '.', '?', '*' を含み、パッケージ名がマッチしなかった場合、
+     POSIX 正規表現であると見なし、
+     データベース内の全パッケージ名に対して適用します。
+     マッチしたパッケージすべてがインストール(もしくは削除)されます。
+     'lo.*' のような文字列は、
+     'how-lo' や 'lowest' にマッチすることに注意してください。
+     そうしたくなければ、'^' や '$' を付けるか、
+     もっと詳しい正規表現を指定してください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>remove</term>
+<!--
+     <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are 
+     removed instead of installed. If a plus sign is appended to the package 
+     name (with no intervening space), the identified package will be 
+     installed instead of removed.</para></listitem>
+-->
+     <listitem><para><literal>remove</literal> は、
+     パッケージが削除されることを除き、<literal>install</literal> と同様です。
+     プラス記号がパッケージ名に (間に空白を含まずに) 付加されると、
+     識別されたパッケージを、削除ではなくインストールします。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>source</term>
+<!--
+     <listitem><para><literal>source</literal> causes <command>apt-get</command> to fetch source packages. APT 
+     will examine the available packages to decide which source package to 
+     fetch. It will then find and download into the current directory the 
+     newest available version of that source package. Source packages are 
+     tracked separately from binary packages via <literal>deb-src</literal> type lines 
+     in the &sources-list; file. This probably will mean that you will not 
+     get the same source as the package you have installed or as you could 
+     install. If the -\-compile options is specified then the package will be 
+     compiled to a binary .deb using dpkg-buildpackage, if -\-download-only is 
+     specified then the source package will not be unpacked.</para>
+-->
+     <listitem><para><literal>source</literal> は、
+     ソースパッケージを取得するのに <command>apt-get</command> します。
+     APT はどのソースパッケージを取得するか決定するよう、
+     利用可能なパッケージを検討します。
+     その後、最新の利用可能なソースパッケージを見つけ、
+     カレントディレクトリへダウンロードします。
+     バイナリパッケージとは別に &sources-list; ファイルの
+     <literal>deb-src</literal> 行から、ソースパッケージを追跡します。
+     これは、インストールした (またはインストールできる) パッケージと、
+     取得元を変えることができることを示しています。
+     --compile オプションが指定された場合、dpkg-buildpackage を用いて
+     バイナリ .deb ファイルへコンパイルを行います。
+     --download-only の場合はソースパッケージを展開しません。</para>
+
+<!--
+     <para>A specific source version can be retrieved by postfixing the source name
+     with an equals and then the version to fetch, similar to the mechanism
+     used for the package files. This enables exact matching of the source 
+     package name and version, implicitly enabling the 
+     <literal>APT::Get::Only-Source</literal> option.</para>
+-->
+     <para>パッケージと同様に、
+     ソース名の後ろにイコールと取得したいバージョンを置くと、
+     指定したバージョンのソースを取得できます。
+     <literal>APT::Get::Only-Source</literal> 
+     オプションが暗黙のうちに有効になっているため、
+     ソースパッケージ名とバージョンに厳密に一致させています。</para>
+     
+<!--
+     <para>Note that source packages are not tracked like binary packages, they 
+     exist only in the current directory and are similar to downloading source
+     tar balls.</para></listitem>
+-->
+     <para>tar ball はカレントディレクトリにのみダウンロードされ、
+     カレントディレクトリに展開されることに注意してください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>build-dep</term>
+<!--
+     <listitem><para><literal>build-dep</literal> causes apt-get to install/remove packages in an 
+     attempt to satisfy the build dependencies for a source package.</para></listitem>
+-->
+     <listitem><para><literal>build-dep</literal> は、
+     ソースパッケージの構築依存関係を満たすように、
+     パッケージのインストール・削除を行います。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>check</term>
+<!--
+     <listitem><para><literal>check</literal> is a diagnostic tool; it updates the package cache and checks 
+     for broken dependencies.</para></listitem>
+-->
+     <listitem><para><literal>check</literal> は、
+     パッケージキャッシュの更新や壊れた依存関係をチェックする診断ツールです。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>clean</term>
+<!--
+     <listitem><para><literal>clean</literal> clears out the local repository of retrieved package 
+     files. It removes everything but the lock file from 
+     <filename>&cachedir;/archives/</filename> and 
+     <filename>&cachedir;/archives/partial/</filename>. When APT is used as a 
+     &dselect; method, <literal>clean</literal> is run automatically.
+     Those who do not use dselect will likely want to run <literal>apt-get clean</literal>
+     from time to time to free up disk space.</para></listitem>
+-->
+     <listitem><para><literal>clean</literal> は、
+     取得したパッケージのローカルリポジトリを掃除します。
+     <filename>&cachedir;/archives/</filename> と 
+     <filename>&cachedir;/archives/partial/</filename>
+     からロックファイル以外すべて削除します。
+     APT が &dselect; から呼ばれるときには、
+     自動的に <literal>clean</literal> が実行されます。
+     dselectを使用しない場合は、ディスクスペースを解放するため、時々 
+     <literal>apt-get clean</literal> を実行したくなるでしょう。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>autoclean</term>
+<!--
+     <listitem><para>Like <literal>clean</literal>, <literal>autoclean</literal> clears out the local 
+     repository of retrieved package files. The difference is that it only 
+     removes package files that can no longer be downloaded, and are largely 
+     useless. This allows a cache to be maintained over a long period without 
+     it growing out of control. The configuration option 
+     <literal>APT::Clean-Installed</literal> will prevent installed packages from being
+     erased if it is set to off.</para></listitem>
+-->
+     <listitem><para><literal>clean</literal> と同様に、
+     <literal>autoclean</literal> は取得したパッケージのローカルリポジトリを掃除します。
+     違いは、もうダウンロードされることがないパッケージファイルや、
+     ほとんど不要なパッケージファイルのみを削除することです。
+     このため、長い期間、キャッシュが管理できずに肥大化することなく、
+     維持することができます。
+     設定オプション <literal>APT::Clean-Installed</literal> に 
+     off をセットしていれば、
+     インストール済のパッケージファイルが削除されるのを防げます。</para></listitem>
+     </varlistentry>
+   </variablelist>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+   &apt-cmdblurb;
+
+   <variablelist>
+     <varlistentry><term><option>-d</option></term><term><option>--download-only</option></term>
+<!--
+     <listitem><para>Download only; package files are only retrieved, not unpacked or installed.
+     Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem>
+-->
+     <listitem><para>ダウンロードのみ - パッケージファイルの取得のみを行い、
+     展開・インストールを行いません。
+     設定項目 - <literal>APT::Get::Download-Only</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term>
+<!--
+     <listitem><para>Fix; attempt to correct a system with broken dependencies in            
+     place. This option, when used with install/remove, can omit any packages
+     to permit APT to deduce a likely solution. Any Package that are specified
+     must completely correct the problem. The option is sometimes necessary when 
+     running APT for the first time; APT itself does not allow broken package 
+     dependencies to exist on a system. It is possible that a system's 
+     dependency structure can be so corrupt as to require manual intervention 
+     (which usually means using &dselect; or <command>dpkg -\-remove</command> to eliminate some of 
+     the offending packages). Use of this option together with <option>-m</option> may produce an
+     error in some situations. 
+     Configuration Item: <literal>APT::Get::Fix-Broken</literal>.</para></listitem>
+-->
+     <listitem><para>修復 - 依存関係が壊れたシステムの修正を試みます。
+     このオプションを install や remove と一緒に使うときは、
+     パッケージを指定しなくてもかまいません。
+     どのパッケージを指定しても、完全に問題を解決します。APT 自体は、
+     システムに存在する壊れたパッケージ依存関係を許すことができないので、
+     初めて APT を実行する場合、このオプションが必要になることがあります。
+     システムの依存関係構造にかなり問題がある場合は、
+     手動で修正するよう要求することもあります。
+     (通常は、問題のあるパッケージを取り除くのに &dselect; や
+     <command>dpkg --remove</command> を使用します)
+     このオプションを <option>-m</option> オプションと同時に使用すると、
+     エラーになる状況があるかもしれません。
+     設定項目 - <literal>APT::Get::Fix-Broken</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-m</option></term><term><option>--ignore-missing</option></term>
+     <term><option>--fix-missing</option></term>
+<!--
+     <listitem><para>Ignore missing packages; If packages cannot be retrieved or fail the    
+     integrity check after retrieval (corrupted package files), hold back    
+     those packages and handle the result. Use of this option together with  
+     <option>-f</option> may produce an error in some situations. If a package is 
+     selected for installation (particularly if it is mentioned on the 
+     command line) and it could not be downloaded then it will be silently 
+     held back.
+     Configuration Item: <literal>APT::Get::Fix-Missing</literal>.</para></listitem>
+-->
+     <listitem><para>欠落パッケージの無視 - パッケージが取得できなかったり、
+     (パッケージの破損で) 取得した後の整合性チェックを通らなかった場合、
+     そのパッケージの処理を保留し最後まで処理を続けます。
+     このオプションを <option>-f</option> オプションと同時に使用すると、
+     エラーになる状況があるかもしれません。
+     パッケージをインストールするよう選択している場合 
+     (特にコマンドラインでの操作時) や、
+     ダウンロードできなかった場合に、なにも表示せず保留することになります。
+     設定項目 - <literal>APT::Get::Fix-Missing</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--no-download</option></term>
+<!--
+     <listitem><para>Disables downloading of packages. This is best used with 
+     <option>-\-ignore-missing</option> to force APT to use only the .debs it has 
+     already downloaded.
+     Configuration Item: <literal>APT::Get::Download</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージのダウンロードを無効にします。
+     これはすでにダウンロードした .deb に対してのみ APT を行う場合に、
+     <option>--ignore-missing</option> と併せて使うのがよいでしょう。
+     設定項目 - <literal>APT::Get::Download</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-q</option></term><term><option>--quiet</option></term>
+<!--
+     <listitem><para>Quiet; produces output suitable for logging, omitting progress indicators.
+     More q's will produce more quiet up to a maximum of 2. You can also use
+     <option>-q=#</option> to set the quiet level, overriding the configuration file. 
+     Note that quiet level 2 implies <option>-y</option>, you should never use -qq 
+     without a no-action modifier such as -d, -\-print-uris or -s as APT may 
+     decided to do something you did not expect.
+     Configuration Item: <literal>quiet</literal>.</para></listitem>
+-->
+     <listitem><para>静粛 - 進捗表示を省略し、
+     ログをとるのに便利な出力を行います。
+     最大 2 つまで q を重ねることでより静粛にできます。
+     また、<option>-q=#</option> のように静粛レベルを指定して、
+     設定ファイルを上書きすることもできます。
+     静粛レベル 2 は <option>-y</option> を含んでいることに注意してください。
+     APT が意図しない決定を行うかもしれないので -d, --print-uris, -s のような
+     操作を行わないオプションをつけずに -qq を使用するべきではありません。
+     設定項目 - <literal>quiet</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-s</option></term>
+                   <term><option>--simulate</option></term>
+		   <term><option>--just-print</option></term>
+		   <term><option>--dry-run</option></term>
+		   <term><option>--recon</option></term>
+		   <term><option>--no-act</option></term>
+<!--
+     <listitem><para>No action; perform a simulation of events that would occur but do not
+     actually change the system. 
+     Configuration Item: <literal>APT::Get::Simulate</literal>.</para>
+-->
+     <listitem><para>動作なし - なにが起こるのかのシミュレーションを行い、
+     実際にはシステムの変更を行いません。
+     設定項目 - <literal>APT::Get::Simulate</literal></para>
+
+<!--
+     <para>Simulate prints out
+     a series of lines each one representing a dpkg operation, Configure (Conf),
+     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages with
+     and empty set of square brackets meaning breaks that are of no consequence
+     (rare).</para></listitem>
+-->
+     <para>シミュレートの結果、dpkg の動作を表す一連の行のそれぞれに、
+     設定 (Conf)、削除 (Remv)、展開 (Inst) を表示します。
+     角カッコは壊れたパッケージを表し、(まれに)
+     空の角カッコは大した問題ではないことを表します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-y</option></term><term><option>--yes</option></term>
+                   <term><option>--assume-yes</option></term>
+<!--
+     <listitem><para>Automatic yes to prompts; assume "yes" as answer to all prompts and run
+     non-interactively. If an undesirable situation, such as changing a held
+     package, trying to install a unauthenticated package or removing an essential package 
+     occurs then <literal>apt-get</literal> will abort. 
+     Configuration Item: <literal>APT::Get::Assume-Yes</literal>.</para></listitem>
+-->
+     <listitem><para>プロンプトへの自動承諾 - すべてのプロンプトに自動的に
+     "yes" と答え、非対話的に実行します。
+     保留したパッケージの状態を変更したり、
+     必須パッケージを削除するような不適切な状況の場合、
+     <literal>apt-get</literal> は処理を中断します。
+     設定項目 - <literal>APT::Get::Assume-Yes</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-u</option></term><term><option>--show-upgraded</option></term>
+<!--
+     <listitem><para>Show upgraded packages; Print out a list of all packages that are to be
+     upgraded. 
+     Configuration Item: <literal>APT::Get::Show-Upgraded</literal>.</para></listitem>
+-->
+     <listitem><para>更新パッケージ表示 -
+     更新される全パッケージを一覧表示します。
+     設定項目 - <literal>APT::Get::Show-Upgraded</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-V</option></term><term><option>--verbose-versions</option></term>
+<!--
+     <listitem><para>Show full versions for upgraded and installed packages.
+     Configuration Item: <literal>APT::Get::Show-Versions</literal>.</para></listitem>
+-->
+     <listitem><para>更新・インストールするパッケージのヴァージョンを、
+     すべて表示します。
+     設定項目 - <literal>APT::Get::Show-Versions</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-b</option></term><term><option>--compile</option></term>
+                   <term><option>--build</option></term>
+<!--
+     <listitem><para>Compile source packages after downloading them.
+     Configuration Item: <literal>APT::Get::Compile</literal>.</para></listitem>
+-->
+     <listitem><para>ソースパッケージをダウンロード後、コンパイルします。
+     設定項目 - <literal>APT::Get::Compile</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--ignore-hold</option></term>
+<!--
+     <listitem><para>Ignore package Holds; This causes <command>apt-get</command> to ignore a hold 
+     placed on a package. This may be useful in conjunction with 
+     <literal>dist-upgrade</literal> to override a large number of undesired holds. 
+     Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem>
+-->
+     <listitem><para>保留パッケージの無視 - パッケージの保留指示を無視して
+    <command>apt-get</command> を行います。
+    <literal>dist-upgrade</literal> と共に、
+    大量のパッケージを保留の解除をするのに使用すると便利です。
+    設定項目 - <literal>APT::Ignore-Hold</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--no-upgrade</option></term>
+<!--
+     <listitem><para>Do not upgrade packages; When used in conjunction with <literal>install</literal>,
+     <literal>no-upgrade</literal> will prevent packages on the command line
+     from being upgraded if they are already installed.
+     Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージ更新なし -  <literal>install</literal> 
+     と同時に使用すると、<literal>no-upgrade</literal> は、
+     指定したパッケージがすでにインストールしてある場合に更新を行いません。
+     設定項目 - <literal>APT::Get::Upgrade</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--force-yes</option></term>
+<!--
+     <listitem><para>Force yes; This is a dangerous option that will cause apt to continue 
+     without prompting if it is doing something potentially harmful. It 
+     should not be used except in very special situations. Using 
+     <literal>force-yes</literal> can potentially destroy your system! 
+     Configuration Item: <literal>APT::Get::force-yes</literal>.</para></listitem>
+-->
+     <listitem><para>強制承諾 - 
+     APT が何か損傷を与えかねない動作をしようとした場合でも、
+     確認の入力なしで実行してしまう危険なオプションです。
+     よほどの状況でなければ、使用しない方がいいでしょう。
+     <literal>force-yes</literal> は、あなたのシステムを破壊しかねません!
+     設定項目 - <literal>APT::Get::force-yes</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--print-uris</option></term>
+<!--
+     <listitem><para>Instead of fetching the files to install their URIs are printed. Each
+     URI will have the path, the destination file name, the size and the expected
+     md5 hash. Note that the file name to write to will not always match
+     the file name on the remote site! This also works with the 
+     <literal>source</literal> and <literal>update</literal> commands. When used with the
+     <literal>update</literal> command the MD5 and size are not included, and it is
+     up to the user to decompress any compressed files.
+     Configuration Item: <literal>APT::Get::Print-URIs</literal>.</para></listitem>
+-->
+     <listitem><para>インストールするファイルを取得する代わりに、
+     その URI を表示します。
+     URI には、パス、対象ファイル名、ファイルサイズ、
+     予測される md5 ハッシュが含まれています。
+     出力したファイル名が、
+     常にリモートサイトのファイル名と一致するわけではない、
+     ということに注意してください!
+     これは <literal>source</literal> コマンド、
+     <literal>update</literal> コマンドでも動作します。
+     <literal>update</literal> で使用したときには、
+     MD5 やファイルサイズを含みません。
+     このとき、圧縮ファイルの展開はユーザの責任において行ってください。
+     設定項目 - <literal>APT::Get::Print-URIs</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--purge</option></term>
+<!--
+     <listitem><para>Use purge instead of remove for anything that would be removed.
+     An asterisk ("*") will be displayed next to packages which are
+     scheduled to be purged.
+     Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
+-->
+     <listitem><para>削除する際、「削除」ではなく「完全削除」を行います。
+     「完全削除」を行うと指示したパッケージ名の後には、
+     アスタリスク ("*") が付きます。
+     設定項目 - <literal>APT::Get::Purge</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--reinstall</option></term>
+<!--
+     <listitem><para>Re-Install packages that are already installed and at the newest version.
+     Configuration Item: <literal>APT::Get::ReInstall</literal>.</para></listitem>
+-->
+     <listitem><para>すでに最新版がインストールされていても、
+     パッケージを再インストールします。
+     設定項目 - <literal>APT::Get::ReInstall</literal>.</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--list-cleanup</option></term>
+<!--
+     <listitem><para>This option defaults to on, use <literal>-\-no-list-cleanup</literal> to turn it 
+     off. When on <command>apt-get</command> will automatically manage the contents of 
+     <filename>&statedir;/lists</filename> to ensure that obsolete files are erased. 
+     The only  reason to turn it off is if you frequently change your source 
+     list. 
+     Configuration Item: <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
+-->
+     <listitem><para>この機能はデフォルトで ON になっています。
+     OFF にするには <literal>--no-list-cleanup</literal> としてください。
+     ON の場合、
+     <command>apt-get</command> は古くなったファイルを確実に消去するため、
+     自動的に <filename>&statedir;/lists</filename> の中身を管理します。
+     これを OFF にするのは、取得元リストを頻繁に変更する時ぐらいでしょう。
+     設定項目 - <literal>APT::Get::List-Cleanup</literal>.</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>-t</option></term>
+                   <term><option>--target-release</option></term>
+                   <term><option>--default-release</option></term>
+<!--
+     <listitem><para>This option controls the default input to the policy engine, it creates
+     a default pin at priority 990 using the specified release string. The
+     preferences file may further override this setting. In short, this option
+     lets you have simple control over which distribution packages will be
+     retrieved from. Some common examples might be 
+     <option>-t '2.1*'</option> or <option>-t unstable</option>.
+     Configuration Item: <literal>APT::Default-Release</literal>;
+     see also the &apt-preferences; manual page.</para></listitem>
+-->
+     <listitem><para>このオプションは、
+     ポリシーエンジンへのデフォルト入力を制御します。
+     これは、指定されたリリース文字列を使用し、
+     デフォルト pin を優先度 990 で作成することです。
+     優先ファイルはこの設定を上書きします。
+     要するにこのオプションで、
+     どの配布パッケージを取得するかを簡単に管理します。
+     一般的な例としては、
+     <option>-t '2.1*'</option> や <option>-t unstable</option> でしょう。
+     設定項目 - <literal>APT::Default-Release</literal>
+     &apt-preferences; のマニュアルページもご覧ください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--trivial-only</option></term>
+<!--
+     <listitem><para>
+     Only perform operations that are 'trivial'. Logically this can be considered
+     related to <option>-\-assume-yes</option>, where <option>-\-assume-yes</option> will answer 
+     yes to any prompt, <option>-\-trivial-only</option> will answer no. 
+     Configuration Item: <literal>APT::Get::Trivial-Only</literal>.</para></listitem>
+-->
+     <listitem><para>
+     「重要でない」操作のみを行います。
+     これは論理的に <option>--assume-yes</option> の仲間と見なせます。
+     <option>--assume-yes</option> は質問にすべて yes と答えますが、
+     <option>--trivial-only</option> はすべて no と答えます。
+     設定項目 - <literal>APT::Get::Trivial-Only</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--no-remove</option></term>
+<!--
+     <listitem><para>If any packages are to be removed apt-get immediately aborts without
+     prompting. 
+     Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージが削除される状況になったとき、
+     プロンプトを表示せず中断します。
+     設定項目 - <literal>APT::Get::Remove</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--only-source</option></term>
+ <!--
+    <listitem><para>Only has meaning for the
+     <literal>source</literal> and <literal>build-dep</literal>
+     commands.  Indicates that the given source names are not to be
+     mapped through the binary table.  This means that if this option
+     is specified, these commands will only accept source package
+     names as arguments, rather than accepting binary package names
+     and looking up the corresponding source package.  Configuration
+     Item: <literal>APT::Get::Only-Source</literal>.</para></listitem>
+-->
+    <listitem><para><literal>source</literal> コマンドと 
+     <literal>build-dep</literal> コマンドでのみ意味があります。
+     指定されたソース名がバイナリテーブルにマップされないようにします。
+     これは、このオプションを指定すると、
+     バイナリパッケージ名を受け付けて対応するソースパッケージを探すのではなく、
+     引数にソースパッケージ名しか受け付けなくなる、ということです。
+     設定項目 - <literal>APT::Get::Only-Source</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--diff-only</option></term><term><option>--tar-only</option></term>
+<!--
+     <listitem><para>Download only the diff or tar file of a source archive. 
+     Configuration Item: <literal>APT::Get::Diff-Only</literal> and 
+     <literal>APT::Get::Tar-Only</literal>.</para></listitem>
+-->
+     <listitem><para>ソースアーカイブの diff ファイルや 
+     tar ファイルのダウンロードのみを行います。
+     設定項目 - <literal>APT::Get::Diff-Only</literal>, 
+     <literal>APT::Get::Tar-Only</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><option>--arch-only</option></term>
+<!--
+     <listitem><para>Only process architecture-dependent build-dependencies.
+     Configuration Item: <literal>APT::Get::Arch-Only</literal>.</para></listitem>
+-->
+     <listitem><para>構築依存関係の解決を、
+     アーキテクチャに依存したもののみ行います。
+     設定項目 - <literal>APT::Get::Arch-Only</literal></para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><option>--allow-unauthenticated</option></term>
+<!--
+     <listitem><para>Ignore if packages can't be authenticated and don't prompt about it.
+     This is usefull for tools like pbuilder.
+     Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージを確認できない場合に無視し、
+     それについて質問しません。
+     pbuilder のようなツールで便利です。
+     設定項目 - <literal>APT::Get::AllowUnauthenticated</literal></para></listitem>
+     </varlistentry>
+     
+
+     &apt-commonoptions;
+     
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+   <variablelist>
+     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>
+<!--
+     <listitem><para>Locations to fetch packages from.
+     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>
+-->
+     <listitem><para>パッケージの取得元。
+     設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>
+<!--
+     <listitem><para>APT configuration file.
+     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>
+-->
+     <listitem><para>APT 設定ファイル。
+     設定項目 - <literal>Dir::Etc::Main</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
+<!--
+     <listitem><para>APT configuration file fragments
+     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
+-->
+     <listitem><para>APT 設定ファイルの断片。
+     設定項目 - <literal>Dir::Etc::Parts</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>/etc/apt/preferences</filename></term>
+<!--
+     <listitem><para>Version preferences file.
+     This is where you would specify "pinning",
+     i.e. a preference to get certain packages
+     from a separate source
+     or from a different version of a distribution.
+     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>
+-->
+     <listitem><para>バージョン優先ファイル。
+     ここに "pin" の設定を行います。
+     つまり、別々の取得元や異なるディストリビューションのバージョンの、
+     どこからパッケージを取得するかを設定します。
+     設定項目 - <literal>Dir::Etc::Preferences</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>&cachedir;/archives/</filename></term>
+<!--
+     <listitem><para>Storage area for retrieved package files.
+     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>
+-->
+     <listitem><para>取得済みパッケージファイル格納エリア。
+     設定項目 - <literal>Dir::Cache::Archives</literal></para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>
+<!--
+     <listitem><para>Storage area for package files in transit.
+     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>
+-->
+     <listitem><para>取得中パッケージファイル格納エリア。
+     設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term><filename>&statedir;/lists/</filename></term>
+<!--
+     <listitem><para>Storage area for state information for each package resource specified in
+     &sources-list;
+     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>
+-->
+     <listitem><para>&sources-list; のパッケージリソース特有の状態情報格納エリア。
+     設定項目 - <literal>Dir::State::Lists</literal></para></listitem>
+     </varlistentry>
+  
+     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>
+<!--
+     <listitem><para> Storage area for state information in transit.
+     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>
+-->
+     <listitem><para>取得中の状態情報格納エリア。
+     設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem>
+     </varlistentry>     
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+<!--
+   <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
+   &apt-conf;, &apt-config;,
+   The APT User's guide in &docdir;, &apt-preferences;, the APT Howto.</para>
+-->
+   <para>&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;,
+   &apt-conf;, &apt-config;,
+   &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+<!--
+   <para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para>
+-->
+   <para><command>apt-get</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
diff --git a/doc/ja/apt-key.ja.8.xml b/doc/ja/apt-key.ja.8.xml
new file mode 100644
index 000000000..732ca9b1c
--- /dev/null
+++ b/doc/ja/apt-key.ja.8.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+ &apt-docinfo;
+ 
+ <refmeta>
+   <refentrytitle>apt-key</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-key</refname>
+<!--
+    <refpurpose>APT key management utility</refpurpose>
+-->
+    <refpurpose>APT キー管理ユーティリティ</refpurpose>
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-key</command>
+      <arg><replaceable>command</replaceable>/</arg>
+      <arg rep="repeat"><option><replaceable>arguments</replaceable></option></arg>
+   </cmdsynopsis>
+ </refsynopsisdiv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+   <para>
+<!--
+   <command>apt-key</command> is used to manage the list of keys used
+   by apt to authenticate packages.  Packages which have been
+   authenticated using these keys will be considered trusted.
+-->
+   <command>apt-key</command> は、
+   apt が パッケージを認証するのに使用するキーの一覧を管理するのに使用します。
+   このキーで認証されたパッケージは、信頼するに足ると見なせるでしょう。
+   </para>
+</refsect1>
+
+<!--
+<refsect1><title>Commands</title>
+-->
+<refsect1><title>コマンド</title>
+   <variablelist>
+     <varlistentry><term>add <replaceable>filename</replaceable></term>
+     <listitem>
+     <para>
+
+<!--
+       Add a new key to the list of trusted keys.  The key is read
+       from <replaceable>filename</replaceable>, or standard input if
+       <replaceable>filename</replaceable> is <literal>-</literal>.
+-->
+       信頼キー一覧に新しいキーを追加します。
+       このキーは <replaceable>filename</replaceable> から読み込みますが、
+       <replaceable>filename</replaceable> を <literal>-</literal> とすると、
+       標準入力から読み込みます。
+     </para>
+
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term>del <replaceable>keyid</replaceable></term>
+     <listitem>
+     <para>
+
+<!--
+       Remove a key from the list of trusted keys.
+-->
+       信頼キー一覧からキーを削除します。
+
+     </para>
+
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term>list</term>
+     <listitem>
+     <para>
+
+<!--
+       List trusted keys.
+-->
+       信頼キーを一覧表示します。
+
+     </para>
+
+     </listitem>
+     </varlistentry>
+
+     <varlistentry><term>update</term>
+     <listitem>
+     <para>
+
+<!--
+       Update the local keyring with the keyring of Debian archive
+       keys and removes from the keyring the archive keys which are no
+       longer valid.
+-->
+       Debian アーカイブキーで、ローカルキーリングを更新し、
+       もう有効でないキーをキーリングから削除します。
+
+     </para>
+
+     </listitem>
+     </varlistentry>
+   </variablelist>
+</refsect1>
+
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+   <variablelist>
+     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>
+<!--
+     <listitem><para>Keyring of local trusted keys, new keys will be added here.</para></listitem>
+-->
+     <listitem><para>ローカル信頼キーのキーリング。
+     新しいキーはここに追加されます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><filename>/etc/apt/trustdb.gpg</filename></term>
+<!--
+     <listitem><para>Local trust database of archive keys.</para></listitem>
+-->
+     <listitem><para>アーカイブキーのローカル信頼データベース</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
+<!--
+     <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+-->
+     <listitem><para>Debian アーカイブ信頼キーのキーリング</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
+<!--
+     <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+-->
+     <listitem><para>削除された Debian アーカイブ信頼キーのキーリング</para></listitem>
+     </varlistentry>
+
+
+
+   </variablelist>
+
+</refsect1>
+
+<!--
+<refsect1><title>See Also</title>
+-->
+<refsect1><title>関連項目</title>
+<para>
+&apt-get;, &apt-secure;
+</para>
+</refsect1>
+
+ &manbugs;
+ &manauthor;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
new file mode 100644
index 000000000..5b9612a7f
--- /dev/null
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+ &apt-docinfo;
+ 
+ <refmeta>
+   <refentrytitle>apt-secure</refentrytitle>
+   <manvolnum>8</manvolnum>
+ </refmeta>
+
+<!-- NOTE: This manpage has been written based on the
+     Securing Debian Manual ("Debian Security
+     Infrastructure" chapter) and on documentation
+     available at the following sites:
+     http://wiki.debian.net/?apt06
+     http://www.syntaxpolice.org/apt-secure/
+     http://www.enyo.de/fw/software/apt-secure/
+-->
+<!-- TODO: write a more verbose example of how it works with 
+     a sample similar to 
+     http://www.debian-administration.org/articles/174
+     ?
+--> 
+
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-secure</refname>
+<!--
+    <refpurpose>Archive authentication support for APT</refpurpose>
+-->
+    <refpurpose>APT アーカイブ認証サポート</refpurpose>
+ </refnamediv>
+
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+   <para>
+<!--
+   Starting with version 0.6, <command>apt</command> contains code
+   that does signature checking of the Release file for all
+   archives. This ensures that packages in the archive can't be
+   modified by people who have no access to the Release file signing
+   key.
+-->
+   バージョン 0.6 より、<command>apt</command> 全アーカイブに対する 
+   Release ファイルの署名チェックコードが含まれています。
+   Release ファイル署名キーにアクセスできない人が、
+   アーカイブのパッケージの変更が確実にできないようにします。
+   </para>
+
+   <para>
+<!--
+   If a package comes from a archive without a signature or with a
+   signature that apt does not have a key for that package is
+   considered untrusted and installing it will result in a big
+   warning. <command>apt-get</command> will currently only warn
+   for unsigned archives, future releases might force all sources
+   to be verified before downloading packages from them.
+-->
+   パッケージに署名されなかったり、apt が知らないキーで署名されていた場合、
+   アーカイブから来たパッケージは、信頼されていないと見なし、
+   インストールの際に重要な警告が表示されます。
+   <command>apt-get</command> は、
+   現在未署名のパッケージに対して警告するだけですが、
+   将来のリリースでは、全ソースに対し、
+   パッケージダウンロード前に強制的に検証される可能性があります。
+   </para>
+
+   <para>
+<!--
+   The package frontends &apt-get;, &aptitude; and &synaptic; support this new
+   authentication feature.
+-->
+   &apt-get;, &aptitude;, &synaptic; といったパッケージフロントエンドは、
+   この新認証機能をサポートしています。
+   </para>
+</refsect1>
+
+<!--
+ <refsect1><title>Trusted archives</title> 
+-->
+ <refsect1><title>信頼済アーカイブ</title> 
+
+   <para> 
+<!--
+   The chain of trust from an apt archive to the end user is made up of
+   different steps. <command>apt-secure</command> is the last step in
+   this chain, trusting an archive does not mean that the packages
+   that you trust it do not contain malicious code but means that you
+   trust the archive maintainer. Its the archive maintainer
+   responsibility to ensure that the archive integrity is correct.
+-->
+   apt アーカイブからエンドユーザまでの信頼の輪は、
+   いくつかのステップで構成されています。
+   <command>apt-secure</command> は、この輪の最後のステップで、
+   アーカイブを信頼することは、
+   パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、
+   アーカイブメンテナを信頼すると言うことです。
+   これは、アーカイブの完全性を保証するのは、
+   アーカイブメンテナの責任だということです。
+   </para>
+
+<!--
+   <para>apt-secure does not review signatures at a
+   package level. If you require tools to do this you should look at
+   <command>debsig-verify</command> and
+   <command>debsign</command> (provided in the debsig-verify and
+   devscripts packages respectively).</para>
+-->
+   <para>apt-secure はパッケージレベルの署名検証は行いません。
+   そのようなツールが必要な場合は、
+   <command>debsig-verify</command> や <command>debsign</command> 
+   (debsig-verify パッケージと devscripts パッケージでそれぞれ提供されています)
+   を確認してください。</para>
+
+   <para>
+<!--
+   The chain of trust in Debian starts when a maintainer uploads a new
+   package or a new version of a package to the Debian archive. This
+   upload in order to become effective needs to be signed by a key of
+   a maintainer within the Debian maintainer's keyring (available in
+   the debian-keyring package). Maintainer's keys are signed by
+   other maintainers following pre-established procedures to
+   ensure the identity of the key holder.
+-->
+   Debian における信頼の輪は、
+   新しいパッケージやパッケージの新しいバージョンを、
+   メンテナが Debian アーカイブにアップロードすることで始まります。
+   これは、Debian メンテナキーリング (debian-keyring パッケージにあります) 
+   にあるメンテナのキーで署名しなければ、アップロードできないということです。
+   メンテナのキーは、キーの所有者のアイデンティティを確保するため、
+   以下のような事前に確立した手段で、他のメンテナに署名されています。
+   </para>
+
+   <para>
+<!--
+   Once the uploaded package is verified and included in the archive,
+   the maintainer signature is stripped off, an MD5 sum of the package
+   is computed and put in the Packages file. The MD5 sum of all of the
+   packages files are then computed and put into the Release file. The
+   Release file is then signed by the archive key (which is created
+   once a year and distributed through the FTP server. This key is
+   also on the Debian keyring.
+-->
+   アップロードされたパッケージごとに、検証してアーカイブに格納します。
+   パッケージは、メンテナの署名をはがされ、 MD5 sum を計算されて、
+   Packages ファイルに格納されます。
+   その後、全パッケージファイルの MD5 sum を計算してから、
+   Release ファイルに置きます。
+   Release ファイルは、アーカイブキーで署名されます。
+   アーカイブキーは年ごとに作成され、FTP サーバで配布されます。
+   このキーも Debian キーリングに含まれます。
+   </para>
+
+   <para>
+<!--
+   Any end user can check the signature of the Release file, extract the MD5
+   sum of a package from it and compare it with the MD5 sum of the
+   package he downloaded. Prior to version 0.6 only the MD5 sum of the
+   downloaded Debian package was checked. Now both the MD5 sum and the
+   signature of the Release file are checked.
+-->
+   エンドユーザは誰でも、Release ファイルの署名をチェックし、
+   パッケージの MD5 sum を抽出して、ダウンロードしたパッケージの MD5 sum 
+   と比較できます。
+   バージョン 0.6 以前では、ダウンロードした Debian パッケージの MD5 sum しか、
+   チェックしていませんでした。
+   現在では、MD5 sum と Release ファイルの署名の両方でチェックします。
+   </para>
+
+<!--
+   <para>Notice that this is distinct from checking signatures on a
+   per package basis. It is designed to prevent two possible attacks:
+-->
+   <para>以上は、パッケージごとの署名チェックとは違うことに注意してください。
+   以下のように考えられる 2 種類の攻撃を防ぐよう設計されています。
+   </para>
+
+    <itemizedlist>
+<!--
+       <listitem><para><literal>Network "man in the middle"
+       attacks</literal>. Without signature checking, a malicious
+       agent can introduce himself in the package download process and
+       provide malicious software either by controlling a network
+       element (router, switch, etc.) or by redirecting traffic to a
+       rogue server (through arp or DNS spoofing
+       attacks).</para></listitem>
+-->
+       <listitem><para><literal>ネットワーク中間者攻撃</literal> 
+       署名をチェックしないと、
+       悪意あるエージェントがパッケージダウンロードプロセスに割り込んだり、
+       ネットワーク構成要素 (ルータ、スイッチなど) の制御や、
+       悪漢サーバへのネットワークトラフィックのリダイレクトなど 
+       (arp 経由や DNS スプーフィング攻撃) で、
+       悪意あるソフトウェアを掴まされたりします。</para></listitem>
+ 
+<!--
+       <listitem><para><literal>Mirror network compromise</literal>.
+        Without signature checking, a malicious agent can compromise a
+        mirror host and modify the files in it to propagate malicious
+        software to all users downloading packages from that
+        host.</para></listitem>
+-->
+       <listitem><para><literal>ミラーネットワーク感染</literal>.
+        署名をチェックしないと、悪意あるエージェントがミラーホストに感染し、
+        このホストからダウンロードしたユーザすべてに、
+        悪意あるソフトウェアが伝播するようにファイルを変更できます。</para></listitem>
+    </itemizedlist>
+
+<!--
+   <para>However, it does not defend against a compromise of the
+   Debian master server itself (which signs the packages) or against a
+   compromise of the key used to sign the Release files. In any case,
+   this mechanism can complement a per-package signature.</para>
+-->
+   <para>しかしこれは、
+   (パッケージに署名する) Debian マスターサーバ自体の感染や、
+   Release ファイルに署名するのに使用したキーの感染を防げません。
+   いずれにせよ、この機構はパッケージごとの署名を補完することができます。</para>
+</refsect1>
+
+<!--
+ <refsect1><title>User configuration</title>
+-->
+ <refsect1><title>ユーザの設定</title>
+   <para>
+<!--
+   <command>apt-key</command> is the program that manages the list
+   of keys used by apt. It can be used to add or remove keys although
+   an installation of this release will automatically provide the
+   default Debian archive signing keys used in the Debian package
+   repositories.
+-->
+   <command>apt-key</command> は、
+   apt が使用するキーリストを管理するプログラムです。
+   このリリースのインストールでは、Debian パッケージリポジトリで使用する、
+   キーで署名するデフォルトの Debian アーカイブを提供しますが、
+   <command>apt-key</command> でキーの追加・削除が行えます。
+   </para>
+   <para>
+<!--
+   In order to add a new key you need to first download it
+   (you should make sure you are using a trusted communication channel
+   when retrieving it), add it with <command>apt-key</command> and
+   then run <command>apt-get update</command> so that apt can download
+   and verify the <filename>Release.gpg</filename> files from the archives you
+   have configured.
+-->
+   新しいキーを追加するためには、まずキーをダウンロードする必要があります。
+   (取得する際には、信頼できる通信チャネルを使用するよう、特に留意してください)
+   取得したキーを、<command>apt-key</command> で追加し、
+   <command>apt-get update</command> を実行してください。
+   以上により、apt は指定したアーカイブから、<filename>Release.gpg</filename> 
+   ファイルをダウンロード・検証できるようになります。
+   </para>
+</refsect1>
+
+<!--
+<refsect1><title>Archive configuration</title>
+-->
+<refsect1><title>アーカイブの設定</title>
+   <para>
+<!--
+   If you want to provide archive signatures in an archive under your
+   maintenance you have to:
+-->
+   あなたがメンテナンスしているアーカイブで、アーカイブ署名を提供したい場合、
+   以下のようにしてください。
+   </para>
+
+     <itemizedlist>
+<!--
+       <listitem><para><literal>Create a toplevel Release
+       file</literal>.  if it does not exist already. You can do this
+       by running <command>apt-ftparchive release</command> 
+       (provided inftp apt-utils).</para></listitem>
+-->
+       <listitem><para><literal>上位 Release ファイルの作成</literal>
+       既にこれが存在しているのでなければ、
+       <command>apt-ftparchive release</command> (apt-utils で提供) 
+       を実行して作成してください。</para></listitem>
+   
+<!--
+      <listitem><para><literal>Sign it</literal>. You can do this by running
+      <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
+-->
+      <listitem><para><literal>署名</literal> 
+      <command>gpg -abs -o Release.gpg Release</command> を実行して、
+      署名してください。</para></listitem>
+
+<!--
+      <listitem><para><literal>Publish the key fingerprint</literal>,
+      that way your users will know what key they need to import in
+      order to authenticate the files in the
+      archive.</para></listitem>
+-->
+      <listitem><para><literal>キーの指紋を配布</literal>
+      これにより、アーカイブ内のファイル認証に、
+      どのキーをインポートする必要があるかを、
+      ユーザに知らせることになります。</para></listitem>
+
+    </itemizedlist>
+
+<!--
+    <para>Whenever the contents of the archive changes (new packages
+    are added or removed) the archive maintainer has to follow the
+    first two steps previously outlined.</para>
+-->
+    <para>アーカイブの内容に変化がある場合 (新しいパッケージの追加や削除)、
+    アーカイブメンテナは前述の最初の 1, 2 ステップに従わなければなりません。</para>
+
+</refsect1>
+
+<!--
+<refsect1><title>See Also</title> 
+-->
+<refsect1><title>関連項目</title> 
+<para> 
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&debsign; &debsig-verify;, &gpg;
+</para>
+
+<!--
+<para>For more backgound information you might want to review the
+<ulink
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+Security Infrastructure</ulink> chapter of the Securing Debian Manual
+(available also in the harden-doc package) and the
+<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+>Strong Distribution HOWTO</ulink> by V. Alex Brennen.  </para>
+-->
+<para>詳細な背景情報を検証するのなら、
+the Securing Debian Manual (harden-doc パッケージにもあります) の
+<ulink
+url="http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html">Debian
+Security Infrastructure</ulink> 章と、
+V. Alex Brennen による 
+<ulink url="http://www.cryptnet.net/fdp/crypto/strong_distro.html"
+>Strong Distribution HOWTO</ulink> をご覧ください。</para>
+
+</refsect1>
+
+ &manbugs;
+ &manauthor;
+
+<!--
+<refsect1><title>Manpage Authors</title> 
+-->
+<refsect1><title>マニュアルページ筆者</title> 
+
+<!--
+<para>This man-page is based on the work of Javier Fernández-Sanguino
+Peña, Isaac Jones, Colin Walters, Florian Weimer and Michael Vogt.
+-->
+<para>このマニュアルページは Javier Fernández-Sanguino
+Peña, Isaac Jones, Colin Walters, Florian Weimer, Michael Vogt 
+の作業を元にしています。
+</para>
+
+</refsect1>
+ 
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/apt-sortpkgs.ja.1.xml b/doc/ja/apt-sortpkgs.ja.1.xml
new file mode 100644
index 000000000..779620f0b
--- /dev/null
+++ b/doc/ja/apt-sortpkgs.ja.1.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt-sortpkgs</refentrytitle>
+   <manvolnum>1</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt-sortpkgs</refname>
+<!--
+    <refpurpose>Utility to sort package index files</refpurpose>
+-->
+    <refpurpose>パッケージインデックスファイルのソートユーティリティ</refpurpose>
+
+ </refnamediv>
+
+ <!-- Arguments -->
+ <refsynopsisdiv>
+   <cmdsynopsis>
+      <command>apt-sortpkgs</command>
+      <arg><option>-hvs</option></arg>
+      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
+      <arg><option>-c=<replaceable>file</replaceable></option></arg>
+      <arg choice="plain" rep="repeat"><replaceable>file</replaceable></arg>
+   </cmdsynopsis>
+ </refsynopsisdiv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><command>apt-sortpkgs</command> will take an index file (Source index or Package 
+   index) and sort the records so that they are ordered by the package name. 
+   It will also sort the internal fields of each record according to the 
+   internal sorting rules.</para>
+-->
+   <para><command>apt-sortpkgs</command> は、インデックスファイル 
+   (ソースインデックスやパッケージインデックス) からレコードをソートし、
+   パッケージ名順に整えます。
+   また、内部のソート規則に従って、内部フィールドについてもソートを行います。</para>
+
+<!--
+   <para>
+   All output is sent to stdout, the input must be a seekable file.</para>
+-->
+   <para>
+   出力はすべて標準出力に送られ、入力は検索できるファイルでなければなりません。</para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>options</title>
+-->
+ <refsect1><title>オプション</title>
+   &apt-cmdblurb;
+   
+   <variablelist>
+     <varlistentry><term><option>-s</option></term><term><option>--source</option></term>
+     <listitem><para>
+<!--
+     Use Source index field ordering.
+     Configuration Item: <literal>APT::SortPkgs::Source</literal>.</para></listitem>
+-->
+     ソースインデックスフィールド順に並べ替え
+     設定項目 - <literal>APT::SortPkgs::Source</literal>.</para></listitem>
+     </varlistentry>
+   
+     &apt-commonoptions;
+     
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-conf;</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Diagnostics</title>
+-->
+ <refsect1><title>診断メッセージ</title>
+   <para><command>apt-sortpkgs</command> は正常終了時に 0 を返します。
+   エラー時には十進の 100 を返します。</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+ 
+</refentry>
diff --git a/doc/ja/apt.conf.ja.5.sgml b/doc/ja/apt.conf.ja.5.sgml
deleted file mode 100644
index 3634096f9..000000000
--- a/doc/ja/apt.conf.ja.5.sgml
+++ /dev/null
@@ -1,785 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!-- translation of version 1.9 -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.ja">
-%aptent;
-
-]>
-
-<refentry lang=ja>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt.conf</>
-   <manvolnum>5</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt.conf</>
-<!--
-    <refpurpose>Configuration file for APT</>
--->
-    <refpurpose>APT ����ե�����</>
- </refnamediv>
- 
-<!--
- <RefSect1><Title>Description</>
--->
- <RefSect1><Title>����</>
-   <para>
-<!--
-   <filename/apt.conf/ is the main configuration file for the APT suite of
-   tools, all tools make use of the configuration file and a common command line
-   parser to provide a uniform environment. When an APT tool starts up it will
-   read the configuration specified by the <envar/APT_CONFIG/ environment 
-   variable (if any) and then read the files in <literal/Dir::Etc::Parts/ 
-   then read the main configuration file specified by 
-   <literal/Dir::Etc::main/ then finally apply the
-   command line options to override the configuration directives, possibly 
-   loading even more config files.
--->
-   <filename/apt.conf/ �ϡ�APT �ġ��뽸�μ�����ե�����Ǥ���
-   ��������ե�����ȶ��̤Υ��ޥ�ɥ饤��ѡ�����Ȥäơ�
-   ���٤ƤΥġ��������Ķ��ǻ��ѤǤ��ޤ���
-   APT �ġ���ε�ư���ˤϡ�<envar/APT_CONFIG/ �Ķ��ѿ��˻��ꤷ�������
-   (¸�ߤ����) �ɤ߹��ߤޤ���
-   ���� <literal/Dir::Etc::Parts/ �Υե�������ɤ߹��ߤޤ���
-   ���θ� <literal/Dir::Etc::main/ �ǻ��ꤷ��������ե�������ɤ߹��ߡ�
-   �Ǹ�˥��ޥ�ɥ饤�󥪥ץ����ǡ�����ե���������������ͤ��񤭤��ޤ���
-   <para>
-<!--
-   The configuration file is organized in a tree with options organized into
-   functional groups. Option specification is given with a double colon
-   notation, for instance <literal/APT::Get::Assume-Yes/ is an option within 
-   the APT tool group, for the Get tool. Options do not inherit from their 
-   parent groups.
--->
-   ����ե�����ϡ���ǽ���롼�פ��Ȥ˷���Ω�Ƥ�줿���ץ�����
-   �ڹ�¤��ɽ���ޤ���
-   ���ץ��������Ƥϡ�2 �ĤΥ�����Ƕ��ڤ�ޤ���
-   �㤨�� <literal/APT::Get::Assume-Yes/ �ϡ�APT �ġ��륰�롼�פΡ�Get �ġ�����
-   ���ץ����Ǥ������ץ����ϡ��ƥ��롼�פ���Ѿ����ޤ���
-   <para>
-<!--
-   Syntacticly the configuration language is modeled after what the ISC tools
-   such as bind and dhcp use. Each line is of the form
-   <literallayout>APT::Get::Assume-Yes "true";</literallayout> The trailing 
-   semicolon is required and the quotes are optional. A new scope can be
-   opened with curly braces, like:
--->
-   ��������ʸˡ�ϡ�bind �� dhcp �Τ褦�� ISC �ġ�����ǥ�ˤ��Ƥ��ޤ���
-   ������ιԤ⡢<literallayout>APT::Get::Assume-Yes "true";</literallayout> ��
-   �褦�ʷ��ǡ����ߥ�����Ƕ��ڤ�ޤ����ޤ����Ѥϥ��ץ����Ǥ���
-   �ʲ��Τ褦���楫�å���Ȥ��ȡ��������������פ򳫤����Ȥ��Ǥ��ޤ���
-<informalexample><programlisting>   
-APT {
-  Get {
-    Assume-Yes "true";
-    Fix-Broken "true";
-  };
-};
-</programlisting></informalexample>
-<!--
-   with newlines placed to make it more readable. Lists can be created by 
-   opening a scope and including a single word enclosed in quotes followed by a 
-   semicolon. Multiple entries can be included, each seperated by a semicolon.
--->
-   �ޤ���Ŭ�����Ԥ��뤳�Ȥǡ�����ɤߤ䤹���ʤ�ޤ���
-   �ꥹ�Ȥϡ��������������ס��������ȤǰϤޤ줿ñ�졢
-   �����ƥ��ߥ������³���뤳�ȤǺ����Ǥ��ޤ���
-   ���ߥ�����Ƕ��ڤ뤳�Ȥǡ�ʣ���Υ���ȥ��ɽ�����Ȥ��Ǥ��ޤ���
-<informalexample><programlisting>   
-DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
-</programlisting></informalexample>
-   <para>
-<!--
-   In general the sample configuration file in 
-   <filename>&docdir;/examples/apt.conf</> &configureindex;
-   is a good guide for how it should look.
--->
-   <filename>&docdir;/examples/apt.conf</> &configureindex; ��
-   ����Ū������ե�����Υ���ץ�Ǥ����ɤΤ褦�����ꤹ�뤫���ͤˤʤ�Ǥ��礦��
-   <para>
-<!--
-   Two specials are allowed, <literal/#include/ and <literal/#clear/. 
-   <literal/#include/ will include the given file, unless the filename
-   ends in a slash, then the whole directory is included.  
-   <literal/#clear/ is used to erase a list of names.
--->
-   <literal/#include/ �� <literal/#clear/ �� 2 �Ĥ����̤ʵ�ˡ������ޤ���
-   <literal/#include/ �ϻ��ꤷ���ե����������ߤޤ���
-   �ե�����̾������å���ǽ���ä����ˤϡ����Υǥ��쥯�ȥ�򤹤٤�
-   �����ߤޤ���
-   <literal/#clear/ ��̾���Υꥹ�Ȥ�������Τ������Ǥ���
-   <para>
-<!--
-   All of the APT tools take a -o option which allows an arbitary configuration 
-   directive to be specified on the command line. The syntax is a full option
-   name (<literal/APT::Get::Assume-Yes/ for instance) followed by an equals
-   sign then the new value of the option. Lists can be appended too by adding 
-   a trailing :: to the list name.   
--->
-   ���٤Ƥ� APT �ġ���ǡ����ޥ�ɥ饤���Ǥ�դ������Ԥ�
-   -o ���ץ���󤬻��ѤǤ��ޤ���
-   ʸˡ�ϡ������ʥ��ץ����̾ (�㡢<literal/APT::Get::Assume-Yes/)��
-   ���桢³���ƥ��ץ����ο������ͤȤʤ�ޤ���
-   �ꥹ��̾��³��::��ä��뤳�Ȥǡ��ꥹ�Ȥ��ɲä��뤳�Ȥ��Ǥ��ޤ���
-   <!-- arbitary = Ǥ�դ� (�ܤäƤʤ��ä����ޤ��ʼ����ߤ���) -->
- </RefSect1>
-
-<!--
- <RefSect1><Title>The APT Group</>
--->
- <RefSect1><Title>APT ���롼��</>
-   <para>   
-<!--
-   This group of options controls general APT behavior as well as holding the
-   options for all of the tools.
--->
-   ���Υ��ץ���󥰥롼�פϡ��ġ������Τ˱ƶ��Τ��롢����Ū�� APT �ο����񤤤�
-   ���椷�ޤ���
-   <VariableList>
-     <VarListEntry><Term>Architecture</Term>
-     <ListItem><Para>
-<!--
-     System Architecture; sets the architecture to use when fetching files and
-     parsing package lists. The internal default is the architecture apt was 
-     compiled for.
--->
-     �����ƥॢ�����ƥ����� - �ե��������������ꡢ�ѥå������ꥹ�Ȥ�
-     ���Ϥ���Ȥ��˻��Ѥ��륢�����ƥ�����򥻥åȤ��ޤ���
-     �����ǤΥǥե���Ȥϡ�apt �򥳥�ѥ��뤷���������ƥ�����Ǥ���
-     </VarListEntry>
-     
-     <VarListEntry><Term>Ignore-Hold</Term>
-     <ListItem><Para>
-<!--
-     Ignore Held packages; This global option causes the problem resolver to
-     ignore held packages in its decision making. 
--->
-     ��α�ѥå�������̵�� - ���Υ������Х륪�ץ����ϡ�����������α��
-     ���ꤷ���ѥå�������̵�뤷�ޤ���
-     <!-- problem resolver ���������Ǥ����Τ��������� -->
-     </VarListEntry>
-
-     <VarListEntry><Term>Clean-Installed</Term>
-     <ListItem><Para>
-<!--
-     Defaults to on. When turned on the autoclean feature will remove any pacakges
-     which can no longer be downloaded from the cache. If turned off then
-     packages that are locally installed are also excluded from cleaning - but
-     note that APT provides no direct means to reinstall them.
--->
-     ���󥹥ȡ���Ѥߥѥå������κ�� -
-     �ǥե���Ȥ�ͭ���Ǥ���autoclean ��ǽ�� on �λ��������������
-     �Ǥ��ʤ��ʤä��ѥå������򥭥�å��夫�������ޤ���
-     off �ξ��ϡ���������˥��󥹥ȡ��뤵��Ƥ���ѥå������ϡ�
-     ����оݤ��鳰���ޤ���
-     ��) APT �ϡ�����å��夫���������ѥå������κƥ��󥹥ȡ�����ˡ��
-     ľ�ܤˤ��󶡤��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Immediate-Configure</Term>
-     <ListItem><Para>
-<!--
-     Disable Immedate Configuration; This dangerous option disables some
-     of APT's ordering code to cause it to make fewer dpkg calls. Doing
-     so may be necessary on some extremely slow single user systems but 
-     is very dangerous and may cause package install scripts to fail or worse.
-     Use at your own risk.
--->
-     ¨������̵�� - ���δ����ʥ��ץ����ϡ�APT ���׵ᥳ���ɤ�̵���ˤ��ơ�
-      dpkg �θƤӽФ���ۤȤ�ɤ��ʤ��褦�ˤ��ޤ���
-     ����ϡ������٤����󥰥�桼�������ƥ�Ǥ�ɬ�פ��⤷��ޤ��󤬡�
-     ���˴����ǡ��ѥå������Υ��󥹥ȡ��륹����ץȤ����Ԥ����ꡢ
-     �⤷���Ϥ�äȰ������Ȥ������뤫�⤷��ޤ���
-     ������Ǥ�ǻ��Ѥ��Ƥ���������
-     <!-- Immedate �� Immediate �� typo? --> 
-     </VarListEntry>
-
-     <VarListEntry><Term>Force-LoopBreak</Term>
-     <ListItem><Para>
-<!--
-     Never Enable this option unless you -really- know what you are doing. It
-     permits APT to temporarily remove an essential package to break a
-     Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
-     packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option 
-     will work if the essential packages are not tar, gzip, libc, dpkg, bash or
-     anything that those packages depend on.
--->
-     ���򤷤褦�Ȥ��Ƥ���Τ��������ˡ�Ƚ�äƤ���ΤǤʤ���С�
-     ���Фˤ��Υ��ץ�����ͭ���ˤ��ʤ��Ǥ���������
-     �Բķ� (essential) �ѥå������δ֤ǡ����� (Conflicts)/ ���� (Conflicts) ��
-     ���� (Conflicts)/ ����ɬ�� (Pre-Depend) �Υ롼�פ����������Ȥ��ˡ�
-     �Բķ�ѥå���������Ū�˺�����ơ��롼�פ�ȴ��������ǽ�ˤ��ޤ���
-     <emphasis>����ʥ롼�פϤ������ʤ��Ϥ��ǡ�
-     ����Ȥ���н���ʥХ��Ǥ���</emphasis>
-     ���Υ��ץ����ϡ�tar, gzip, libc, dpkg, bash �Ȥ���餬��¸���Ƥ���
-     �ѥå������ʳ����Բķ�ѥå�������ư��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Cache-Limit</Term>
-     <ListItem><Para>
-<!--
-     APT uses a fixed size memory mapped cache file to store the 'available'
-     information. This sets the size of that cache.
--->
-     APT �ϡ������Ѳ�ǽ�׾�����Ǽ���뤿��ˡ����ꥵ������
-     ����ޥåץ���å���ե��������Ѥ��ޤ���
-     ���Υ��ץ����ϡ����Υ���å��奵��������ꤷ�ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Build-Essential</Term>
-     <ListItem><Para>
-<!--
-     Defines which package(s) are considered essential build dependencies.
--->
-     ���۰�¸�ط����Բķ�ʥѥå�������������ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Get</Term>
-     <ListItem><Para>
-<!--
-     The Get subsection controls the &apt-get; tool, please see its
-     documentation for more information about the options here.
--->
-     ���֥�������� Get �� &apt-get; �ġ�������椷�ޤ���
-     ���Υ��ץ����ξܺ٤� &apt-get; ��ʸ��򻲾Ȥ��Ƥ���������
-     </VarListEntry>
-
-     <VarListEntry><Term>Cache</Term>
-     <ListItem><Para>
-<!--
-     The Cache subsection controls the &apt-cache; tool, please see its
-     documentation for more information about the options here.
--->
-     ���֥�������� Cache �� &apt-cache; �ġ�������椷�ޤ���
-     ���Υ��ץ����ξܺ٤� &apt-cache; ��ʸ��򻲾Ȥ��Ƥ���������
-     </VarListEntry>
-
-     <VarListEntry><Term>CDROM</Term>
-     <ListItem><Para>
-<!--
-     The CDROM subsection controls the &apt-cdrom; tool, please see its
-     documentation for more information about the options here.
--->
-     ���֥�������� CDROM �� &apt-cdrom; �ġ�������椷�ޤ���
-     ���Υ��ץ����ξܺ٤� &apt-cdrom; ��ʸ��򻲾Ȥ��Ƥ���������
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>The Acquire Group</>
--->
- <RefSect1><Title>Acquire ���롼��</>
-   <para>   
-<!--
-   The <literal/Acquire/ group of options controls the download of packages 
-   and the URI handlers. 
--->
-   <literal/Acquire/ ���ץ���󥰥롼�פϡ��ѥå������Υ���������ɤ� 
-   URI �ϥ�ɥ�������Ԥ��ޤ���
-   <VariableList>
-     <VarListEntry><Term>Queue-Mode</Term>
-     <ListItem><Para>
-<!--
-     Queuing mode; <literal/Queue-Mode/ can be one of <literal/host/ or 
-     <literal/access/ which determines how  APT parallelizes outgoing 
-     connections. <literal/host/ means that one connection per target host 
-     will be opened, <literal/access/ means that one connection per URI type 
-     will be opened.
--->
-     ���塼�⡼�� - <literal/Queue-Mode/ ��APT���ɤΤ褦��������³��Ԥ�����
-     <literal/host/ �� <literal/access/ �ǻ���Ǥ��ޤ���
-     <literal/host/ �ϡ��������åȥۥ��Ȥ��Ȥ� 1 ��³�򳫤��ޤ���
-     <literal/access/ �ϡ�URI �����פ��Ȥ� 1 ��³�򳫤��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Retries</Term>
-     <ListItem><Para>
-<!--
-     Number of retries to perform. If this is non-zero APT will retry failed 
-     files the given number of times.
--->
-     ��ȥ饤�β�������ꤷ�ޤ���0 �Ǥʤ���硢APT �ϼ��Ԥ����ե�������Ф��ơ�
-     Ϳ����줿���������ȥ饤��Ԥ��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Source-Symlinks</Term>
-     <ListItem><Para>
-<!--
-     Use symlinks for source archives. If set to true then source archives will
-     be symlinked when possible instead of copying. True is the default
--->
-     ���������������֤Υ���ܥ�å���󥯤���Ѥ��ޤ���
-     true �����åȤ���Ƥ���Ȥ�����ǽ�ʤ饳�ԡ�������˥���ܥ�å���󥯤�
-     ĥ���ޤ���true ���ǥե���ȤǤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>http</Term>
-     <ListItem><Para>
-<!--
-     HTTP URIs; http::Proxy is the default http proxy to use. It is in the 
-     standard form of <literal>http://[[user][:pass]@]host[:port]/</>. Per 
-     host proxies can also be specified by using the form 
-     <literal/http::Proxy::&lt;host&gt;/ with the special keyword <literal/DIRECT/ 
-     meaning to use no proxies. The <envar/http_proxy/ environment variable
-     will override all settings.
--->
-     HTTP URI - http::Proxy �ϡ��ǥե���Ȥǻ��Ѥ��� http �ץ������Ǥ���
-     <literal>http://[[user][:pass]@]host[:port]/</>�Ȥ���ɸ�����ɽ���ޤ���
-     �ۥ��Ȥ��ȤΥץ������ξ��ϡ�<literal/http::Proxy::&lt;host&gt;/ �Ȥ���
-     ���ȡ��ץ���������Ѥ��ʤ��Ȥ�����̣���ü쥭����� <literal/DIRECT/ ��
-     ���Ѥ��ƻ��ꤹ�뤳�Ȥ�Ǥ��ޤ���
-     ���٤Ƥ�����ϡ��Ķ��ѿ� <envar/http_proxy/ �Ǿ�񤭤���ޤ���
-     <para>
-<!--
-     Three settings are provided for cache control with HTTP/1.1 complient 
-     proxy caches. <literal/No-Cache/ tells the proxy to not use its cached 
-     response under any circumstances, <literal/Max-Age/ is sent only for 
-     index files and tells the cache to refresh its object if it is older than 
-     the given number of seconds. Debian updates its index files daily so the 
-     default is 1 day. <literal/No-Store/ specifies that the cache should never 
-     store this request, it is only set for archive files. This may be useful 
-     to prevent polluting a proxy cache with very large .deb files. Note: 
-     Squid 2.0.2 does not support any of these options.
--->
-     HTTP/1.1 ���Υץ���������å��������ˤĤ��ơ�3 ��������꤬����ޤ���
-     <literal/No-Cache/ �ϥץ��������Ф��ơ������ʤ���⥭��å������Ѥ��ʤ�
-     �������ޤ���
-     <literal/Max-Age/ �ϡ�����ǥå����ե������ѤΤȤ�������������
-     ����줿���֤���Ť��ä����ˡ����֥������Ȥ��ե�å��夹��褦
-     ����å���˻ؼ����ޤ���
-     �ǥե���ȤǤ� 1 ���ȤʤäƤ��뤿�ᡢDebian ������ˤ��Υ���ǥå���
-     �ե�����򹹿����ޤ���
-     <literal/No-Store/ �ϡ�����å��夬���Υꥯ�����Ȥ��Ǽ������
-     ���������֥ե�����Τ����ꤹ��褦���ꤷ�ޤ���
-     ����ϡ������礭��.deb�ե�����ǥץ���������å��夬�����Τ�
-     �ɤ��Τ��������⤷��ޤ���
-     ��) Squid 2.0.2 �Ǥϡ������Υ��ץ����򥵥ݡ��Ȥ��Ƥ��ޤ���
-     <para>
-<!--
-     The option <literal/timeout/ sets the timeout timer used by the method, 
-     this applies to all things including connection timeout and data timeout.
--->
-     <literal/timeout/ ���ץ����ϡ�������ˡ�ǤΥ����ॢ���ȤޤǤλ��֤�
-     ���ꤷ�ޤ���
-     ����ˤϡ���³�Υ����ॢ���Ȥȥǡ����Υ����ॢ���Ȥ��ޤޤ�Ƥ��ޤ���
-     <para>
-<!--
-     One setting is provided to control the pipeline depth in cases where the
-     remote server is not RFC conforming or buggy (such as Squid 2.0.2)
-     <literal/Acquire::http::Pipeline-Depth/ can be a value from 0 to 5 
-     indicating how many outstanding requests APT should send. A value of
-     zero MUST be specified if the remote host does not properly linger
-     on TCP connections - otherwise data corruption will occur. Hosts which
-     require this are in violation of RFC 2068.     
--->
-     ��⡼�ȥ����Ф� RFC ���Ǥʤ��ä��ꡢ(Squid 2.0.2 �Τ褦��) �Х���
-     ���ä��ꤷ���Ȥ��Τ���ˡ��ѥ��ץ饤��ο�������������ꤷ�ޤ���
-     <literal/Acquire::http::Pipeline-Depth/ �ˤ�ꡢAPT �������Ǥ���
-     �ꥯ�����Ȥβ���� 0 ���� 5 ���ͤ�����Ǥ��ޤ���
-     ��⡼�ȥ����Ф�Ŭ�ڤǤʤ���TCP ��³�˻��֤�������Ȥ��ϡ�
-     <emphasis>ɬ��</emphasis>0���ͤ����ꤷ�ʤ���Фʤ�ޤ���
-     �����Ǥʤ���С��ǡ�������»���Ƥ��ޤ��ޤ���
-     ���줬ɬ�פʥۥ��Ȥϡ�RFC 2068 �˰�ȿ���Ƥ��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>ftp</Term>
-     <ListItem><Para>
-<!--
-     FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 
-     standard form of <literal>ftp://[[user][:pass]@]host[:port]/</> and is 
-     overriden by the <envar/ftp_proxy/ environment variable. To use a ftp 
-     proxy you will have to set the <literal/ftp::ProxyLogin/ script in the 
-     configuration file. This entry specifies the commands to send to tell 
-     the proxy server what to connect to. Please see 
-     &configureindex; for an example of 
-     how to do this. The subsitution variables available are 
-     <literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, <literal/$(SITE_USER)/,
-     <literal/$(SITE_PASS)/, <literal/$(SITE)/, and <literal/$(SITE_PORT)/.
-     Each is taken from it's respective URI component.
--->
-     FTP URI - ftp::Proxy �ϡ��ǥե���Ȥǻ��Ѥ���ץ����������ФǤ���
-     <literal>ftp://[[user][:pass]@]host[:port]/</> �Ȥ���ɸ�����ɽ���ޤ�����
-     �Ķ��ѿ� <envar/ftp_proxy/ �Ǿ�񤭤���ޤ���
-     ftp �ץ���������Ѥ���ˤϡ�����ե������ <literal/ftp::ProxyLogin/ 
-     ������ץȤ����ꤹ��ɬ�פ�����ޤ���
-     �ץ����������Ф�����������³���ޥ�ɤ򡢤��Υ���ȥ�����ꤷ�ޤ���
-     �ɤΤ褦�ˤ���Τ��� &configureindex; ����򻲾Ȥ��Ƥ���������
-     ����¾�ˤ⡢<literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/, 
-     <literal/$(SITE_USER)/, <literal/$(SITE_PASS)/, <literal/$(SITE)/, 
-     <literal/$(SITE_PORT)/ �����Ѳ�ǽ�Ǥ���
-     ������⡢���줾�� URI ��������ȡ�����Ǥ���
-     <para>
-<!--
-     The option <literal/timeout/ sets the timeout timer used by the method, 
-     this applies to all things including connection timeout and data timeout.
--->
-     <literal/timeout/ ���ץ����ϡ�������ˡ�ǤΥ����ॢ���ȤޤǤλ��֤�
-     ���ꤷ�ޤ���
-     ����ˤϡ���³�Υ����ॢ���Ȥȥǡ����Υ����ॢ���Ȥ��ޤޤ�Ƥ��ޤ���
-     <para>
-<!--
-     Several settings are provided to control passive mode. Generally it is 
-     safe to leave passive mode on, it works in nearly every environment. 
-     However some situations require that passive mode be disabled and port 
-     mode ftp used instead. This can be done globally, for connections that 
-     go through a proxy or for a specific host (See the sample config file 
-     for examples)
--->
-     ����Τ����Ĥ��ϡ��ѥå��֥⡼�ɤ����椹���ΤǤ���
-     ����Ū�ˡ��ѥå��֥⡼�ɤΤޤޤˤ��Ƥ������������ǡ�
-     �ۤܤɤ�ʴĶ��Ǥ�ư��ޤ���
-     ����������������Ǥϡ��ѥå��֥⡼�ɤ�̵���Τ��ᡢ
-     ����˥ݡ��ȥ⡼�� ftp ����Ѥ���ɬ�פ�����ޤ���
-     ��������ϡ��ץ��������̤���³������Υۥ��Ȥؤ���³���̤�ͭ���Ǥ���
-     (������ϥ���ץ�����ե�����򻲾Ȥ��Ƥ�������)
-     <para>
-<!--
-     It is possible to proxy FTP over HTTP by setting the <envar/ftp_proxy/
-     environment variable to a http url - see the discussion of the http method
-     above for syntax. You cannot set this in the configuration file and it is
-     not recommended to use FTP over HTTP due to its low efficiency.
--->
-     �Ķ��ѿ� <envar/ftp_proxy/ �� http url �ˤ�� FTP over HTTP �Υץ�������
-     ���Ѳ�ǽ�ˤʤ�ޤ���ʸˡ�Ͼ�� http �ˤĤ��Ƥ������򻲾Ȥ��Ƥ���������
-     ����ե��������Ǥ���򥻥åȤ��뤳�ȤϤǤ��ޤ���
-     �ޤ�����Ψ���������� FTP over HTTP ����Ѥ���ΤϿ侩���ޤ���
-     <para>
-<!--
-     The setting <literal/ForceExtended/ controls the use of RFC2428 
-     <literal/EPSV/ and <literal/EPRT/ commands. The defaut is false, which means
-     these commands are only used if the control connection is IPv6. Setting this
-     to true forces their use even on IPv4 connections. Note that most FTP servers
-     do not support RFC2428.
--->
-     <literal/ForceExtended/ ������� RFC2428 �� <literal/EPSV/ �� 
-     <literal/EPRT/ ���ޥ�ɤλ��Ѥ����椷�ޤ���
-     �ǥե���ȤǤ� false �Ǥ�������ϡ�����ȥ����륳�ͥ������ IPv6 
-     �λ��ˤΤߡ����Υ��ޥ�ɤ���Ѥ���Ȥ������ȤǤ���
-     ����� true �˥��åȤ���ȡ�IPv4 ���ͥ������Ǥ⶯��Ū�ˡ�
-     ���Υ��ޥ�ɤ���Ѥ��ޤ���
-     ��) �ۤȤ�ɤ� FTP �����Ф� RFC2428 �򥵥ݡ��Ȥ��Ƥ��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>cdrom</Term>
-     <ListItem><Para>
-<!--
-     CDROM URIs; the only setting for CDROM URIs is the mount point, 
-     <literal/cdrom::Mount/ which must be the mount point for the CDROM drive 
-     as specified in <filename>/etc/fstab</>. It is possible to provide 
-     alternate mount and unmount commands if your mount point cannot be listed 
-     in the fstab (such as an SMB mount and old mount packages). The syntax 
-     is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within 
-     the cdrom block. It is important to have the trailing slash. Unmount 
-     commands can be specified using UMount.
--->
-     CDROM URI - �ޥ���ȥݥ���Ȥ�����Τߤ�Ԥ��ޤ���
-     <filename>/etc/fstab</> �����ꤵ��Ƥ���褦�ˡ�CDROM �ɥ饤�֤�
-     �ޥ���ȥݥ���Ȥ� <literal/cdrom::Mount/ �����ꤷ�ʤ���Фʤ�ޤ���
-     (SMB �ޥ���Ȥ�Ť� mount �ѥå������ʤ�) �ޥ���ȥݥ���Ȥ� fstab ��
-     ���ҤǤ��ʤ���硢�����˥ޥ���ȡ�����ޥ���ȥ��ޥ�ɤ���ѤǤ��ޤ���
-     ʸˡ�ϡ�cdrom �֥��å��� 
-     <literallayout>"/cdrom/"::Mount "foo";</literallayout> �η��ǵ��Ҥ��ޤ���
-     ����å�����ˤĤ���ΤϽ��פǤ���
-     ����ޥ���ȥ��ޥ�ɤ� UMount �ǻ��ꤹ�뤳�Ȥ��Ǥ��ޤ���
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Directories</>
--->
- <RefSect1><Title>�ǥ��쥯�ȥ�</>
-   <para>   
-<!--
-   The <literal/Dir::State/ section has directories that pertain to local 
-   state information. <literal/lists/ is the directory to place downloaded 
-   package lists in and <literal/status/ is the name of the dpkg status file.
-   <literal/preferences/ is the name of the APT preferences file.
-   <literal/Dir::State/ contains the default directory to prefix on all sub 
-   items if they do not start with <filename>/</> or <filename>./</>. 
--->
-   <literal/Dir::State/ ���������ϡ�����������־���˴ؤ���ǥ��쥯�ȥ��
-   �ݻ����ޤ���
-   <literal/lists/ �ϡ�����������ɤ����ѥå������������Ǽ����ǥ��쥯�ȥ�ǡ�
-   <literal/status/ �� dpkg �ξ��֥ե������̾����ɽ���ޤ���
-   <literal/preferences/ �� APT �� ����ե������̾���Ǥ���
-   <literal/Dir::State/ �ˤϡ�<filename>/</> �� <filename>./</>�ǻϤޤ�ʤ�
-   �����֥����ƥ���ղä��롢�ǥե���ȥǥ��쥯�ȥ��ޤ�Ǥ��ޤ���
-   <para>
-<!--
-   <literal/Dir::Cache/ contains locations pertaining to local cache 
-   information, such as the two package caches <literal/srcpkgcache/ and 
-   <literal/pkgcache/ as well as the location to place downloaded archives, 
-   <literal/Dir::Cache::archives/. Generation of caches can be turned off
-   by setting their names to be blank. This will slow down startup but
-   save disk space. It is probably prefered to turn off the pkgcache rather
-   than the srcpkgcache. Like <literal/Dir::State/ the default
-   directory is contained in <literal/Dir::Cache/
--->
-   <literal/Dir::Cache/ �ϥ������륭��å������˴ؤ�������Ǽ���Ƥ��ޤ���
-   ����ϡ�����������ɺѥ��������֤ξ��򼨤� <literal/Dir::Cache::archives/ 
-   ��Ʊ�͡�<literal/srcpkgcache/ �� <literal/pkgcache/ �Υѥå���������å����
-   ���Ȥʤ�ޤ���
-   ���줾�����˥��åȤ��뤳�Ȥǡ�����å����������̵���ˤǤ��ޤ���
-   ����ϵ�ư���٤��ʤ�ޤ������ǥ��������ڡ���������ˤʤ�ޤ���
-   �����餯��srcpkgcache ���� pkgcache ��̵���ˤ��뤳�Ȥ���
-   ¿���Ȼפ��ޤ���
-   <literal/Dir::State/ ��Ʊ�͡�<literal/Dir::Cache/ ��
-   �ǥե���ȥǥ��쥯�ȥ��ޤ�Ǥ��ޤ���
-   <para>
-<!--
-   <literal/Dir::Etc/ contains the location of configuration files, 
-   <literal/sourcelist/ gives the location of the sourcelist and 
-   <literal/main/ is the default configuration file (setting has no effect,
-   unless it is done from the config file specified by 
-   <envar/APT_CONFIG/).
--->
-   <literal/Dir::Etc/ ������ե�����ξ����Ǽ���Ƥ��ޤ���
-   <literal/sourcelist/ �ϥ������ꥹ�Ȥξ��򼨤���
-   <literal/main/ �ϥǥե���Ȥ�����ե�����Ǥ���
-   (<envar/APT_CONFIG/ ������ե��������ꤵ�줿���Τߡ�
-   ��������θ��̤�����ޤ�)
-   <para>
-<!--
-   The <literal/Dir::Parts/ setting reads in all the config fragments in 
-   lexical order from the directory specified. After this is done then the
-   main config file is loaded.
--->
-   <literal/Dir::Parts/ ����ϡ����ꤵ�줿�ǥ��쥯�ȥ꤫�顢
-   ����ñ�̤����Ƥ��������Ҥ��ɤߤ��ߤޤ���
-   ��������ꤷ����ˡ��ᥤ������ե����������ɤ��ޤ���
-   <para>
-<!--
-   Binary programs are pointed to by <literal/Dir::Bin/. <literal/methods/ 
-   specifies the location of the method handlers and <literal/gzip/, 
-   <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/, 
-   <literal/dpkg-buildpackage/ and <literal/apt-cache/ specify the location
-   of the respective programs.
--->
-   �Х��ʥ�ץ������� <literal/Dir::Bin/ �ǻ��ꤷ�ޤ���
-   <literal/methods/ �ϥ᥽�åɥϥ�ɥ�ξ�����ꤷ��
-   <literal/gzip/, <literal/dpkg/, <literal/apt-get/, <literal/dpkg-source/, 
-   <literal/dpkg-buildpackage/, <literal/apt-cache/ �Ϥ��줾��
-   �ץ������ξ�����ꤷ�ޤ���
- </RefSect1>
-
-<!-- 
- <RefSect1><Title>APT in DSelect</>
--->
- <RefSect1><Title>DSelect �Ǥ� APT</>
-   <para>   
-<!--
-   When APT is used as a &dselect; method several configuration directives
-   control the default behaviour. These are in the <literal/DSelect/ section.
--->
-   &dselect; ��� APT ����Ѥ���ݡ�<literal/DSelect/ ���������ʲ���
-   ������ܤǡ��ǥե���Ȥ�ư������椷�ޤ���
-   <VariableList>
-     <VarListEntry><Term>Clean</Term>
-     <ListItem><Para>
-<!--
-     Cache Clean mode; this value may be one of always, prompt, auto,
-     pre-auto and never.  always and prompt will remove all packages from
-     the cache after upgrading, prompt (the default) does so conditionally. 
-     auto removes only those packages which are no longer downloadable
-     (replaced with a new version for instance).  pre-auto performs this
-     action before downloading new packages.
--->
-     ����å��奯�꡼��⡼�� - �����ͤ� always, prompt, auto, pre-auto never
-     �Τ������ҤȤĤ���ޤ���
-     always �� prompt �Ϲ����塢���ѥå������򥭥�å��夫�������ޤ���
-     (�ǥե���Ȥ�) prompt �ǤϾ���դ��Ǻ�����ޤ���
-     auto �ϥ������������ǽ�ѥå����� (�㤨�п��С��������֤�������줿���)
-     �������ޤ���
-     pre-auto �Ϥ���ư��򡢿��ѥå����������������ɤ���ľ���˹Ԥ��ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Options</Term>
-     <ListItem><Para>
-<!--
-     The contents of this variable is passed to &apt-get; as command line
-     options when it is run for the install phase.
--->
-     �����ѿ������Ƥϡ�install ���Υ��ޥ�ɥ饤�󥪥ץ�����Ʊ�ͤˡ�
-     &apt-get; ���Ϥ���ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>UpdateOptions</Term>
-     <ListItem><Para>
-<!--
-     The contents of this variable is passed to &apt-get; as command line
-     options when it is run for the update phase.
--->
-     �����ѿ������Ƥϡ�update ���Υ��ޥ�ɥ饤�󥪥ץ�����Ʊ�ͤˡ�
-     &apt-get; ���Ϥ���ޤ���     
-     </VarListEntry>
-
-     <VarListEntry><Term>PromptAfterUpdate</Term>
-     <ListItem><Para>
-<!--
-     If true the [U]pdate operation in &dselect; will always prompt to continue. 
-     The default is to prompt only on error.
--->
-     True �ξ�硢&dselect; �� [U]pdate �¹Ի��ˡ�³�ԤΤ���Υץ���ץȤ�
-     ���ɽ�����ޤ����ǥե���Ȥϥ��顼��ȯ���������ΤߤǤ���
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
- 
-<!--
- <RefSect1><Title>How APT calls dpkg</>
--->
- <RefSect1><Title>APT �� dpkg ��Ƥ���ˡ</>
-   <para>   
-<!--
-   Several configuration directives control how APT invokes &dpkg;. These are 
-   in the <literal/DPkg/ section.
--->
-   �����������ܤ� APT ���ɤΤ褦�� &dpkg; ��ƤӽФ���������Ǥ��ޤ���
-   <literal/DPkg/ ���������ˤ���ޤ���
-   <VariableList>
-     <VarListEntry><Term>Options</Term>
-     <ListItem><Para>
-<!--
-     This is a list of options to pass to dpkg. The options must be specified
-     using the list notation and each list item is passed as a single argument
-     to &dpkg;.
--->
-     dpkg ���Ϥ����ץ����Υꥹ�ȤǤ���
-     ���ץ����ϡ��ꥹ�ȵ�ˡ����Ѥ��ƻ��ꤷ�ʤ���Фʤ�ޤ���
-     �ޤ����ƥꥹ�Ȥ�ñ��ΰ����Ȥ��� &dpkg; ���Ϥ���ޤ���
-     </VarListEntry>
-     
-     <VarListEntry><Term>Pre-Invoke</Term><Term>Post-Invoke</Term>
-     <ListItem><Para>
-<!--
-     This is a list of shell commands to run before/after invoking &dpkg;. 
-     Like <literal/Options/ this must be specified in list notation. The 
-     commands are invoked in order using <filename>/bin/sh</>, should any 
-     fail APT will abort.
--->
-     &dpkg; ��ƤӽФ�����Ǽ¹Ԥ��륷���륳�ޥ�ɤΥꥹ�ȤǤ���
-     <literal/Options/ �Τ褦�ˡ��ꥹ�ȵ�ˡ�ǻ��ꤷ�ʤ���Фʤ�ޤ���
-     ���ޥ�ɤ� <filename>/bin/sh</> ����Ѥ��ƸƤӽФ��졢
-     �������꤬����С�APT �ϰ۾ｪλ���ޤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Pre-Install-Pkgs</Term>
-     <ListItem><Para>
-<!--
-     This is a list of shell commands to run before invoking dpkg. Like
-     <literal/Options/ this must be specified in list notation. The commands
-     are invoked in order using <filename>/bin/sh</>, should any fail APT 
-     will abort. APT will pass to the commands on standard input the 
-     filenames of all .deb files it is going to install, one per line.
--->
-     &dpkg; ��ƤӽФ����˼¹Ԥ��륷���륳�ޥ�ɤΥꥹ�ȤǤ���
-     <literal/Options/ �Τ褦�ˡ��ꥹ�ȵ�ˡ�ǻ��ꤷ�ʤ���Фʤ�ޤ���
-     ���ޥ�ɤ� <filename>/bin/sh</> ����Ѥ��ƸƤӽФ��졢
-     �������꤬����С�APT �ϰ۾ｪλ���ޤ���
-     APT �ϥ��󥹥ȡ��뤷�褦�Ȥ����� .deb �ե�����Υե�����̾��
-     �ҤȤĤ��ĥ��ޥ�ɤ�ɸ�����Ϥ�����ޤ���
-     <para>
-<!--
-     Version 2 of this protocol dumps more information, including the 
-     protocol version, the APT configuration space and the packages, files
-     and versions being changed. Version 2 is enabled by setting 
-     <literal/DPkg::Tools::Options::cmd::Version/ to 2. <literal/cmd/ is a
-     command given to <literal/Pre-Install-Pkgs/.
--->
-     ���Υץ��ȥ���ΥС������ 2 �Ǥϡ�(�ץ��ȥ���ΥС������� 
-     APT ���ꥹ�ڡ������ѥå�������ޤ�) �ܺپ����ե����롢
-     �ѹ�����Ƥ���С���������Ϥ��ޤ���
-     <literal/DPkg::Tools::Options::cmd::Version/ �� 2 �򥻥åȤ���ȡ�
-     �С������ 2 ��ͭ���ˤǤ��ޤ���
-     <literal/cmd/ �� <literal/Pre-Install-Pkgs/ ��Ϳ�����륳�ޥ�ɤǤ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Run-Directory</Term>
-     <ListItem><Para>
-<!--
-     APT chdirs to this directory before invoking dpkg, the default is 
-     <filename>/</>.
--->
-     APT �� dpkg ��ƤӽФ����ˤ��Υǥ��쥯�ȥ�˰�ư���ޤ���
-     �ǥե���Ȥ� <filename>/</> �Ǥ���
-     </VarListEntry>
-
-     <VarListEntry><Term>Build-Options</Term>
-     <ListItem><Para>
-<!--
-     These options are passed to &dpkg-buildpackage; when compiling packages,
-     the default is to disable signing and produce all binaries.
--->
-     �����Υ��ץ����ϡ��ѥå������Υ���ѥ������ &dpkg-buildpackage; ��
-     �Ϥ���ޤ���
-     �ǥե���ȤǤϡ���̾��̵���ˤ������Х��ʥ���������ޤ���
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
-<!--
- <RefSect1><Title>Debug Options</>
--->
- <RefSect1><Title>�ǥХå����ץ����</>
-   <para>   
-<!--
-   Most of the options in the <literal/debug/ section are not interesting to 
-   the normal user, however <literal/Debug::pkgProblemResolver/ shows 
-   interesting output about the decisions dist-upgrade makes. 
-   <literal/Debug::NoLocking/ disables file locking so APT can do some 
-   operations as non-root and <literal/Debug::pkgDPkgPM/ will print out the 
-   command line for each dpkg invokation. <literal/Debug::IdentCdrom/ will 
-   disable the inclusion of statfs data in CDROM IDs.
--->
-   <literal/debug/ ��¿���Υ��ץ����ϡ����̤Υ桼���ˤȤäƶ�̣�������ΤǤ�
-   ����ޤ��󡣤�������<literal/Debug::pkgProblemResolver/ �ǡ�
-   dist-upgrade ��Ƚ�ǤˤĤ��Ƥζ�̣�������Ϥ������ޤ���
-   <literal/Debug::NoLocking/ �ϡ�APT ���� root �����Ǥ���褦��
-   �ե�����Υ��å���̵���ˤ��ޤ����� <literal/Debug::pkgDPkgPM/ �ϡ�
-   dpkg ��ƤֺݤΥ��ޥ�ɥ饤�����Ϥ��ޤ���
-   <literal/Debug::IdentCdrom/ �ϡ�CDROM ID �ξ��֥ǡ�������ޤ�̵���ˤ��ޤ���
-   <!-- statfs �� status �� typo? -->
- </RefSect1>
-
-<!-- 
- <RefSect1><Title>Examples</>
--->
- <RefSect1><Title>��</>
-   <para>
-<!--
-   &configureindex; contains a 
-   sample configuration file showing the default values for all possible 
-   options.
--->
-   &configureindex; �ˡ������Ѳ�ǽ���ץ����Υǥե�����ͤ򻲾ȤǤ��롢
-   ����ե�����Υ���ץ뤬����ޤ���
- </RefSect1>
- 
-<!--
- <RefSect1><Title>Files</>
--->
- <RefSect1><Title>�ե�����</>
-   <para>
-   <filename>/etc/apt/apt.conf</>
- </RefSect1>
-
-<!-- 
- <RefSect1><Title>See Also</>
--->
- <RefSect1><Title>����</>
-   <para>
-   &apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.
- </RefSect1>
-
- &manbugs;
- &manauthor;
- &translator;
-
-</refentry>
diff --git a/doc/ja/apt.conf.ja.5.xml b/doc/ja/apt.conf.ja.5.xml
new file mode 100644
index 000000000..8707c801e
--- /dev/null
+++ b/doc/ja/apt.conf.ja.5.xml
@@ -0,0 +1,809 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>apt.conf</refentrytitle>
+   <manvolnum>5</manvolnum>
+ </refmeta>
+ 
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt.conf</refname>
+<!--
+    <refpurpose>Configuration file for APT</refpurpose>
+-->
+    <refpurpose>APT 設定ファイル</refpurpose>
+ </refnamediv>
+ 
+<!--
+ <refsect1><title>Description</title>
+-->
+ <refsect1><title>説明</title>
+<!--
+   <para><filename>apt.conf</filename> is the main configuration file for the APT suite of
+   tools, all tools make use of the configuration file and a common command line
+   parser to provide a uniform environment. When an APT tool starts up it will
+   read the configuration specified by the <envar>APT_CONFIG</envar> environment 
+   variable (if any) and then read the files in <literal>Dir::Etc::Parts</literal> 
+   then read the main configuration file specified by 
+   <literal>Dir::Etc::main</literal> then finally apply the
+   command line options to override the configuration directives, possibly 
+   loading even more config files.</para>
+-->
+   <para><filename>apt.conf</filename> は、
+   APT ツール集のメイン設定ファイルです。
+   この設定ファイルと共通のコマンドラインパーサを使って、
+   すべてのツールを統一環境で使用できます。
+   APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変数に指定した設定を
+   (存在すれば) 読み込みます。
+   次に <literal>Dir::Etc::Parts</literal> のファイルを読み込みます。
+   次に <literal>Dir::Etc::main</literal> で指定した主設定ファイルを読み込み、
+   最後にコマンドラインオプションで、
+   設定ファイルより取得した値を上書きします。</para>
+
+<!--
+   <para>The configuration file is organized in a tree with options organized into
+   functional groups. option specification is given with a double colon
+   notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within 
+   the APT tool group, for the Get tool. options do not inherit from their 
+   parent groups.</para> 
+-->
+   <para>設定ファイルは、
+   機能グループごとに系統立てられたオプションを木構造で表します。
+   オプションの内容は、2 つのコロンで区切ります。
+   例えば <literal>APT::Get::Assume-Yes</literal> は、
+   APT ツールグループの、Get ツール用オプションです。
+   オプションは、親グループから継承しません。</para> 
+
+<!--
+   <para>Syntacticly the configuration language is modeled after what the ISC tools
+   such as bind and dhcp use.  Lines starting with
+   <literal>//</literal> are treated as comments (ignored).
+   Each line is of the form
+   <literal>APT::Get::Assume-Yes "true";</literal> The trailing 
+   semicolon is required and the quotes are optional. A new scope can be
+   opened with curly braces, like:</para>
+    -->
+   <para>設定言語の文法は、
+   bind や dhcp のような ISC ツールをモデルにしています。
+   <literal>//</literal> で始まる行はコメントとして扱われます (無視)。
+   いずれの行も、<literallayout>APT::Get::Assume-Yes "true";</literallayout> の
+   ような形式です。
+   行末のセミコロンは必要ですが、ダブルクォートは使わなくてもかまいません。
+   以下のように中カッコを使うと、新しいスコープを開くことができます。</para>
+
+<informalexample><programlisting>   
+APT {
+  Get {
+    Assume-Yes "true";
+    Fix-Broken "true";
+  };
+};
+</programlisting></informalexample>
+
+<!--
+   <para>with newlines placed to make it more readable. Lists can be created by 
+   opening a scope and including a single word enclosed in quotes followed by a 
+   semicolon. Multiple entries can be included, each separated by a semicolon.</para>
+-->
+   <para>また適宜改行することで、より読みやすくなります。
+   リストは、開いたスコープ、クォートで囲まれた単語、
+   そしてセミコロンと続けることで作成できます。
+   セミコロンで区切ることで、複数のエントリを表すことができます。</para>
+
+<informalexample><programlisting>   
+DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
+</programlisting></informalexample>
+
+<!--
+   <para>In general the sample configuration file in 
+   <filename>&docdir;examples/apt.conf</filename> &configureindex;
+   is a good guide for how it should look.</para>
+-->
+   <para><filename>&docdir;examples/apt.conf</filename> &configureindex; 
+   は一般的な設定ファイルのサンプルです。
+   どのように設定するか参考になるでしょう。</para>
+
+<!--
+   <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal> 
+   <literal>#include</literal> will include the given file, unless the filename
+   ends in a slash, then the whole directory is included.  
+   <literal>#clear</literal> is used to erase a list of names.</para>
+-->
+   <para><literal>#include</literal> と <literal>#clear</literal> の 
+   2 つの特別な記法があります。
+   <literal>#include</literal> は指定したファイルを取り込みます。
+   ファイル名がスラッシュで終わった場合には、
+   そのディレクトリをすべて取り込みます。
+   <literal>#clear</literal> は名前のリストを削除するのに便利です。</para>
+
+<!--
+   <para>All of the APT tools take a -o option which allows an arbitrary configuration 
+   directive to be specified on the command line. The syntax is a full option
+   name (<literal>APT::Get::Assume-Yes</literal> for instance) followed by an equals
+   sign then the new value of the option. Lists can be appended too by adding 
+   a trailing :: to the list name.</para>
+-->
+   <para>すべての APT ツールで、
+   コマンドラインで任意の設定を行う -o オプションが使用できます。
+   文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</literal>)、
+   等号、続いてオプションの新しい値となります。
+   リスト名に続き::を加えることで、リストを追加することができます。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The APT Group</title>
+-->
+ <refsect1><title>APT グループ</title>
+<!--
+   <para>This group of options controls general APT behavior as well as holding the
+   options for all of the tools.</para>
+-->
+   <para>このオプショングループは、ツール全体に影響のある、
+   一般的な APT の振る舞いを制御します。</para>
+
+   <variablelist>
+     <varlistentry><term>Architecture</term>
+<!--
+     <listitem><para>System Architecture; sets the architecture to use when fetching files and
+     parsing package lists. The internal default is the architecture apt was 
+     compiled for.</para></listitem>
+-->
+     <listitem><para>システムアーキテクチャ - ファイルを取得したり、
+     パッケージリストを解析するときに使用するアーキテクチャをセットします。
+     内部でのデフォルトは、
+     apt をコンパイルしたアーキテクチャです。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>Ignore-Hold</term>
+<!--
+     <listitem><para>Ignore Held packages; This global option causes the problem resolver to
+     ignore held packages in its decision making.</para></listitem>
+-->
+     <listitem><para>保留パッケージの無視 - このグローバルオプションは、
+     問題解決器に保留と指定したパッケージを無視します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Clean-Installed</term>
+<!--
+     <listitem><para>Defaults to on. When turned on the autoclean feature will remove any packages
+     which can no longer be downloaded from the cache. If turned off then
+     packages that are locally installed are also excluded from cleaning - but
+     note that APT provides no direct means to reinstall them.</para></listitem>
+-->
+     <listitem><para>デフォルトで有効です。autoclean 機能が on の時、
+     ダウンロードできなくなったパッケージをキャッシュから削除します。
+     off の場合、ローカルにインストールされているパッケージは、
+     削除対象から外します。
+     しかし、 APT はキャッシュから削除したパッケージの再インストール方法を、
+     直接提供するわけではないことに注意してください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Immediate-Configure</term>
+<!--
+     <listitem><para>Disable Immediate Configuration; This dangerous option disables some
+     of APT's ordering code to cause it to make fewer dpkg calls. Doing
+     so may be necessary on some extremely slow single user systems but 
+     is very dangerous and may cause package install scripts to fail or worse.
+     Use at your own risk.</para></listitem>
+-->
+     <listitem><para>即時設定無効 - この危険なオプションは、
+     APT の要求コードを無効にして dpkg の呼び出しをほとんどしないようにします。
+     これは、非常に遅いシングルユーザシステムでは必要かもしれませんが、
+     非常に危険で、パッケージのインストールスクリプトが失敗したり、
+     もしくはもっと悪いことがおきるかもしれません。
+     自己責任で使用してください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Force-LoopBreak</term>
+<!--
+     <listitem><para>Never Enable this option unless you -really- know what you are doing. It
+     permits APT to temporarily remove an essential package to break a
+     Conflicts/Conflicts or Conflicts/Pre-Depend loop between two essential
+     packages. SUCH A LOOP SHOULD NEVER EXIST AND IS A GRAVE BUG. This option 
+     will work if the essential packages are not tar, gzip, libc, dpkg, bash or
+     anything that those packages depend on.</para></listitem>
+-->
+     <listitem><para>何をしようとしているのか「本当に」判っているのでなければ、
+     絶対にこのオプションを有効にしないでください。
+     不可欠 (essential) パッケージ同士で、
+     競合 (Conflicts) /競合や競合/事前依存 (Pre-Depend) 
+     のループに落ち込んだときに、
+     不可欠パッケージを一時的に削除してループを抜けられるようにします。
+     <emphasis>そんなループはあり得ないはずで、
+     あるとすれば重大なバグです。</emphasis>
+     このオプションは、tar, gzip, libc, dpkg, bash とそれらが依存している
+     パッケージ以外の不可欠パッケージで動作します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Cache-Limit</term>
+<!--
+     <listitem><para>APT uses a fixed size memory mapped cache file to store the 'available'
+     information. This sets the size of that cache (in bytes).</para></listitem>
+-->
+     <listitem><para>APT は「利用可能」情報を格納するために、
+     固定サイズのメモリマップキャッシュファイルを使用します。
+     このオプションは、そのキャッシュサイズを指定します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Build-Essential</term>
+<!--
+     <listitem><para>Defines which package(s) are considered essential build dependencies.</para></listitem>
+-->
+     <listitem><para>構築依存関係で不可欠なパッケージを定義します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Get</term>
+<!--
+     <listitem><para>The Get subsection controls the &apt-get; tool, please see its
+     documentation for more information about the options here.</para></listitem>
+-->
+     <listitem><para>サブセクション Get は &apt-get; ツールを制御します。
+     このオプションの詳細は &apt-get; の文書を参照してください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Cache</term>
+<!--
+     <listitem><para>The Cache subsection controls the &apt-cache; tool, please see its
+     documentation for more information about the options here.</para></listitem>
+-->
+     <listitem><para>サブセクション Cache は &apt-cache; ツールを制御します。
+     このオプションの詳細は &apt-cache; の文書を参照してください。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>CDROM</term>
+<!--
+     <listitem><para>The CDROM subsection controls the &apt-cdrom; tool, please see its
+     documentation for more information about the options here.</para></listitem>
+-->
+     <listitem><para>サブセクション CDROM は &apt-cdrom; ツールを制御します。
+     このオプションの詳細は &apt-cdrom; の文書を参照してください。</para></listitem>
+     </varlistentry>
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>The Acquire Group</title>
+-->
+ <refsect1><title>Acquire グループ</title>
+<!--
+   <para>The <literal>Acquire</literal> group of options controls the download of packages 
+   and the URI handlers. 
+-->
+   <para><literal>Acquire</literal> オプショングループは、
+   パッケージのダウンロードや URI ハンドラの制御を行います。
+   <variablelist>
+     <varlistentry><term>Queue-Mode</term>
+<!--
+     <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or 
+     <literal>access</literal> which determines how  APT parallelizes outgoing 
+     connections. <literal>host</literal> means that one connection per target host 
+     will be opened, <literal>access</literal> means that one connection per URI type 
+     will be opened.</para></listitem>
+-->
+     <listitem><para>キューモード - <literal>Queue-Mode</literal> は、
+     APT がどのように並列接続を行うか、
+     <literal>host</literal> か <literal>access</literal> で指定できます。
+     <literal>host</literal> は、ターゲットホストごとに 1 接続を開きます。
+     <literal>access</literal> は、
+     URI タイプごとに 1 接続を開きます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Retries</term>
+<!--
+     <listitem><para>Number of retries to perform. If this is non-zero APT will retry failed 
+     files the given number of times.</para></listitem>
+-->
+     <listitem><para>リトライの回数を設定します。
+     0 でない場合、APT は失敗したファイルに対して、
+     与えられた回数だけリトライを行います。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Source-Symlinks</term>
+<!--
+     <listitem><para>Use symlinks for source archives. If set to true then source archives will
+     be symlinked when possible instead of copying. True is the default.</para></listitem>
+-->
+     <listitem><para>ソースアーカイブのシンボリックリンクを使用します。
+     true がセットされているとき、可能ならコピーの代わりにシンボリックリンクが
+     張られます。true がデフォルトです。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>http</term>
+<!--
+     <listitem><para>HTTP URIs; http::Proxy is the default http proxy to use. It is in the 
+     standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per 
+     host proxies can also be specified by using the form 
+     <literal>http::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> 
+     meaning to use no proxies. The <envar>http_proxy</envar> environment variable
+     will override all settings.</para>
+-->
+     <listitem><para>HTTP URI - http::Proxy は、
+     デフォルトで使用する http プロキシです。
+     <literal>http://[[user][:pass]@]host[:port]/</literal> 
+     という標準形で表します。ホストごとのプロキシの場合は、
+     <literal>http::Proxy::&lt;host&gt;</literal> という形と、
+     プロキシを使用しないという意味の特殊キーワード <literal>DIRECT</literal> 
+     を使用して指定することもできます。すべての設定は、
+     環境変数 <envar>http_proxy</envar> で上書きされます。</para>
+
+<!--
+     <para>Three settings are provided for cache control with HTTP/1.1 compliant 
+     proxy caches. <literal>No-Cache</literal> tells the proxy to not use its cached 
+     response under any circumstances, <literal>Max-Age</literal> is sent only for 
+     index files and tells the cache to refresh its object if it is older than 
+     the given number of seconds. Debian updates its index files daily so the 
+     default is 1 day. <literal>No-Store</literal> specifies that the cache should never 
+     store this request, it is only set for archive files. This may be useful 
+     to prevent polluting a proxy cache with very large .deb files. Note: 
+     Squid 2.0.2 does not support any of these options.</para>
+-->
+     <para>HTTP/1.1 準拠のプロキシキャッシュの制御について、
+     3 種類の設定があります。<literal>No-Cache</literal> はプロキシに対して、
+     いかなる時もキャッシュを使用しないと伝えます。
+     <literal>Max-Age</literal> は、インデックスファイル用のときだけ送信し、
+     得られた時間よりも古かった場合に、
+     オブジェクトをリフレッシュするようキャッシュに指示します。
+     デフォルトでは 1 日となっているため、
+     Debian は日毎にそのインデックスファイルを更新します。
+     <literal>No-Store</literal> は、キャッシュがこのリクエストを格納せず、
+     アーカイブファイルのみ設定するよう指定します。
+     これは、非常に大きな .deb ファイルでプロキシキャッシュが汚れるのを、
+     防ぐのに便利かもしれません。
+     注) Squid 2.0.2 では、これらのオプションをサポートしていません。</para>
+
+<!--
+     <para>The option <literal>timeout</literal> sets the timeout timer used by the method, 
+     this applies to all things including connection timeout and data timeout.</para>
+-->
+     <para><literal>timeout</literal> オプションは、
+     この方法でのタイムアウトまでの時間を設定します。
+     これには、接続のタイムアウトとデータのタイムアウトが含まれています。</para>
+
+<!--
+     <para>One setting is provided to control the pipeline depth in cases where the
+     remote server is not RFC conforming or buggy (such as Squid 2.0.2)
+     <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 
+     indicating how many outstanding requests APT should send. A value of
+     zero MUST be specified if the remote host does not properly linger
+     on TCP connections - otherwise data corruption will occur. Hosts which
+     require this are in violation of RFC 2068.</para></listitem>
+-->
+     <para>リモートサーバが RFC 準拠でなかったり、
+     (Squid 2.0.2 のように) バグがあったりしたときのために、
+     パイプラインの深さの制御を設定します。
+     <literal>Acquire::http::Pipeline-Depth</literal> により、
+     APT が送信できるリクエストの回数を 0 から 5 の値で設定できます。
+     リモートサーバが適切でなく、TCP 接続に時間がかかるときは、
+     <emphasis>必ず</emphasis> 0 の値を設定しなければなりません。
+     そうでなければデータが破損してしまいます。
+     これが必要なホストは RFC 2068 に違反しています。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>ftp</term>
+<!--
+     <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 
+     standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is 
+     overridden by the <envar>ftp_proxy</envar> environment variable. To use a ftp 
+     proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the 
+     configuration file. This entry specifies the commands to send to tell 
+     the proxy server what to connect to. Please see 
+     &configureindex; for an example of 
+     how to do this. The subsitution variables available are 
+     <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
+     <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>
+     Each is taken from it's respective URI component.</para>
+-->
+     <listitem><para>FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。
+     <literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表しますが、
+     環境変数 <envar>ftp_proxy</envar> で上書きされます。
+     ftp プロキシを使用するには、設定ファイルに <literal>ftp::ProxyLogin</literal>
+     スクリプトを設定する必要があります。
+     プロキシサーバに送信する接続コマンドを、このエントリに設定します。
+     どのようにするのかは &configureindex; の例を参照してください。
+     その他にも、<literal>$(PROXY_USER)</literal> 
+     <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal>
+     <literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> 
+     <literal>$(SITE_PORT)</literal> が利用可能です。
+     いずれも、それぞれ URI を構成するトークンです。</para>
+
+<!--
+     <para>The option <literal>timeout</literal> sets the timeout timer used by the method, 
+     this applies to all things including connection timeout and data timeout.</para>
+-->
+     <para><literal>timeout</literal> オプションは、
+     この方法でのタイムアウトまでの時間を設定します。
+     これには、接続のタイムアウトとデータのタイムアウトが含まれています。</para>
+
+<!--
+     <para>Several settings are provided to control passive mode. Generally it is 
+     safe to leave passive mode on, it works in nearly every environment. 
+     However some situations require that passive mode be disabled and port 
+     mode ftp used instead. This can be done globally, for connections that 
+     go through a proxy or for a specific host (See the sample config file 
+     for examples).</para>
+-->
+     <para>設定のいくつかは、パッシブモードを制御するものです。
+     一般的に、パッシブモードのままにしておく方が安全で、
+     ほぼどんな環境でも動作します。
+     しかしある状況下では、パッシブモードが無効のため、
+     代わりにポートモード ftp を使用する必要があります。
+     この設定は、プロキシを通る接続や特定のホストへの接続全般に有効です。
+     (設定例はサンプル設定ファイルを参照してください)</para>
+
+<!--
+     <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar>
+     environment variable to a http url - see the discussion of the http method
+     above for syntax. You cannot set this in the configuration file and it is
+     not recommended to use FTP over HTTP due to its low efficiency.</para>
+-->
+     <para>環境変数 <envar>ftp_proxy</envar> の http url により 
+     FTP over HTTP のプロキシが利用可能になります。
+     文法は上の http についての説明を参照してください。
+     設定ファイルの中でこれをセットすることはできません。
+     また、効率が悪いため FTP over HTTP を使用するのは推奨しません。</para>
+
+<!--
+     <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428 
+     <literal>EPSV</literal> and <literal>EPRT</literal> commands. The defaut is false, which means
+     these commands are only used if the control connection is IPv6. Setting this
+     to true forces their use even on IPv4 connections. Note that most FTP servers
+     do not support RFC2428.</para></listitem>
+-->
+     <para><literal>ForceExtended</literal> の設定は RFC2428 の
+     <literal>EPSV</literal> コマンドと <literal>EPRT</literal> 
+     コマンドの使用を制御します。デフォルトでは false です。
+     これは、コントロールコネクションが IPv6 の時にのみ、
+     このコマンドを使用するということです。
+     これを true にセットすると、IPv4 コネクションでも強制的に、
+     このコマンドを使用します。
+     注) ほとんどの FTP サーバは RFC2428 をサポートしていません。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>cdrom</term>
+<!--
+     <listitem><para>CDROM URIs; the only setting for CDROM URIs is the mount point, 
+     <literal>cdrom::Mount</literal> which must be the mount point for the CDROM drive 
+     as specified in <filename>/etc/fstab</filename>. It is possible to provide 
+     alternate mount and unmount commands if your mount point cannot be listed 
+     in the fstab (such as an SMB mount and old mount packages). The syntax 
+     is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within 
+     the cdrom block. It is important to have the trailing slash. Unmount 
+     commands can be specified using UMount.</para></listitem>
+-->
+     <listitem><para>CDROM URI - マウントポイントの設定のみを行います。
+     <filename>/etc/fstab</filename> で設定されているように、
+     CDROM ドライブのマウントポイントを 
+     <literal>cdrom::Mount</literal> に設定しなければなりません。
+     (SMB マウントや古い mount パッケージなど) マウントポイントが fstab 
+     に記述できない場合、かわりにマウント・アンマウントコマンドも使用できます。
+     文法は、cdrom ブロックを 
+     <literallayout>"/cdrom/"::Mount "foo";</literallayout> の形で記述します。
+     スラッシュを後につけるのは重要です。
+     アンマウントコマンドは UMount で指定することができます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>gpgv</term>
+<!--
+     <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
+     <literal>gpgv::Options</literal> Additional options passed to gpgv.
+     </para></listitem>
+-->
+     <listitem><para>GPGV URI - GPGV URI 用の唯一のオプションは、
+     gpgv に渡す追加パラメータのオプションです。
+     <literal>gpgv::Options</literal> gpgv に渡す追加オプション。
+     </para></listitem>
+     </varlistentry>
+
+   </variablelist>
+  </para>
+ </refsect1>
+
+<!--
+ <refsect1><title>Directories</title>
+-->
+ <refsect1><title>ディレクトリ</title>
+
+<!--
+   <para>The <literal>Dir::State</literal> section has directories that pertain to local 
+   state information. <literal>lists</literal> is the directory to place downloaded 
+   package lists in and <literal>status</literal> is the name of the dpkg status file.
+   <literal>preferences</literal> is the name of the APT preferences file.
+   <literal>Dir::State</literal> contains the default directory to prefix on all sub 
+   items if they do not start with <filename>/</filename> or <filename>./</filename>.</para>
+-->
+   <para><literal>Dir::State</literal> セクションは、
+   ローカル状態情報に関するディレクトリを保持します。
+   <literal>lists</literal> は、
+   ダウンロードしたパッケージ一覧を格納するディレクトリで、
+   <literal>status</literal> は dpkg の状態ファイルの名前を表します。
+   <literal>preferences</literal> は APT の 設定ファイルの名前です。
+   <literal>Dir::State</literal> には、
+   <filename>/</filename> や <filename>./</filename> で始まらない
+   全サブアイテムに付加する、デフォルトディレクトリを含んでいます。</para>
+
+<!--
+   <para><literal>Dir::Cache</literal> contains locations pertaining to local cache 
+   information, such as the two package caches <literal>srcpkgcache</literal> and 
+   <literal>pkgcache</literal> as well as the location to place downloaded archives, 
+   <literal>Dir::Cache::archives</literal>. Generation of caches can be turned off
+   by setting their names to be blank. This will slow down startup but
+   save disk space. It is probably prefered to turn off the pkgcache rather
+   than the srcpkgcache. Like <literal>Dir::State</literal> the default
+   directory is contained in <literal>Dir::Cache</literal></para>
+-->
+   <para><literal>Dir::Cache</literal> は、
+   ローカルキャッシュ情報に関する場所を格納しています。これは、
+   ダウンロード済アーカイブの場所を示す <literal>Dir::Cache::archives</literal>
+   と同様に、<literal>srcpkgcache</literal> と <literal>pkgcache</literal> 
+   のパッケージキャッシュの場所となります。
+   それぞれを空にセットすることで、キャッシュの生成を無効にできます。
+   おそらく、srcpkgcache よりも pkgcache を無効にすることが多いと思います。
+   <literal>Dir::State</literal> と同様、<literal>Dir::Cache</literal>
+   はデフォルトディレクトリを含んでいます。</para>
+
+<!--
+   <para><literal>Dir::Etc</literal> contains the location of configuration files, 
+   <literal>sourcelist</literal> gives the location of the sourcelist and 
+   <literal>main</literal> is the default configuration file (setting has no effect,
+   unless it is done from the config file specified by 
+   <envar>APT_CONFIG</envar>).</para>
+-->
+   <para><literal>Dir::Etc</literal> は設定ファイルの場所を格納しています。
+   <literal>sourcelist</literal> はソースリストの場所を示し、
+   <literal>main</literal> はデフォルトの設定ファイルです。
+   (<envar>APT_CONFIG</envar> で設定ファイルを指定された場合のみ、
+   この設定の効果があります)</para>
+
+<!--
+   <para>The <literal>Dir::Parts</literal> setting reads in all the config fragments in 
+   lexical order from the directory specified. After this is done then the
+   main config file is loaded.</para>
+-->
+   <para><literal>Dir::Parts</literal> 設定は、指定されたディレクトリから、
+   字句単位の全ての設定断片を読みこみます。
+   これを設定した後に、メイン設定ファイルをロードします。</para>
+
+<!--
+   <para>Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> 
+   specifies the location of the method handlers and <literal>gzip</literal>, 
+   <literal>dpkg</literal>, <literal>apt-get</literal> <literal>dpkg-source</literal> 
+   <literal>dpkg-buildpackage</literal> and <literal>apt-cache</literal> specify the location
+   of the respective programs.</para>
+-->
+   <para>バイナリプログラムは <literal>Dir::Bin</literal> で指定します。
+   <literal>Dir::Bin::Methods</literal> はメソッドハンドラの場所を指定し、
+   <literal>gzip</literal>, <literal>dpkg</literal>,
+   <literal>apt-get</literal>, <literal>dpkg-source</literal>, 
+   <literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal> 
+   はそれぞれプログラムの場所を指定します。</para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>APT in DSelect</title>
+-->
+ <refsect1><title>DSelect での APT</title>
+<!--
+   <para>   
+   When APT is used as a &dselect; method several configuration directives
+   control the default behaviour. These are in the <literal>DSelect</literal> section.</para>
+-->
+   <para>   
+   &dselect; 上で APT を使用する際、
+   <literal>DSelect</literal> セクション以下の設定項目で、
+   デフォルトの動作を制御します。</para>
+   <variablelist>
+     <varlistentry><term>Clean</term>
+<!--
+     <listitem><para>Cache Clean mode; this value may be one of always, prompt, auto,
+     pre-auto and never.  always and prompt will remove all packages from
+     the cache after upgrading, prompt (the default) does so conditionally. 
+     auto removes only those packages which are no longer downloadable
+     (replaced with a new version for instance).  pre-auto performs this
+     action before downloading new packages.</para></listitem>
+-->
+     <listitem><para>キャッシュクリーンモード - 
+     この値は always, prompt, auto, pre-auto, never のうちひとつを取ります。
+     always と prompt は更新後、全パッケージをキャッシュから削除します。
+     (デフォルトの) prompt では条件付きで削除します。
+     auto はダウンロード不能パッケージ (例えば新バージョンで置き換えられたもの)
+     を削除します。pre-auto はこの動作を、
+     新パッケージをダウンロードする直前に行います。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>options</term>
+<!--
+     <listitem><para>The contents of this variable is passed to &apt-get; as command line
+     options when it is run for the install phase.</para></listitem>
+-->
+     <listitem><para>この変数の内容は、
+     install 時のコマンドラインオプションと同様に &apt-get; に渡されます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Updateoptions</term>
+<!--
+     <listitem><para>The contents of this variable is passed to &apt-get; as command line
+     options when it is run for the update phase.</para></listitem>
+-->
+     <listitem><para>この変数の内容は、
+     update 時のコマンドラインオプションと同様に &apt-get; に渡されます。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>PromptAfterUpdate</term>
+<!--
+     <listitem><para>If true the [U]pdate operation in &dselect; will always prompt to continue. 
+     The default is to prompt only on error.</para></listitem>
+-->
+     <listitem><para>true の場合、
+     &dselect; の [U]pdate 実行時に、続行のためのプロンプトを毎回表示します。
+     デフォルトはエラーが発生した場合のみです。</para></listitem>
+     </varlistentry>
+   </variablelist>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>How APT calls dpkg</title>
+-->
+ <refsect1><title>APT が dpkg を呼ぶ方法</title>
+<!--
+   <para>Several configuration directives control how APT invokes &dpkg;. These are 
+   in the <literal>DPkg</literal> section.</para>
+-->
+   <para>数種の設定項目で APT がどのように &dpkg; を呼び出すかを制御できます。
+   <literal>DPkg</literal> セクションにあります。</para>
+
+   <variablelist>
+     <varlistentry><term>options</term>
+<!--
+     <listitem><para>This is a list of options to pass to dpkg. The options must be specified
+     using the list notation and each list item is passed as a single argument
+     to &dpkg;.</para></listitem>
+-->
+     <listitem><para>dpkg に渡すオプションのリストです。
+     オプションは、リスト記法を使用して指定しなければなりません。
+     また、各リストは単一の引数として &dpkg; に渡されます。</para></listitem>
+     </varlistentry>
+     
+     <varlistentry><term>Pre-Invoke</term><term>Post-Invoke</term>
+<!--
+     <listitem><para>This is a list of shell commands to run before/after invoking &dpkg;. 
+     Like <literal>options</literal> this must be specified in list notation. The 
+     commands are invoked in order using <filename>/bin/sh</filename>, should any 
+     fail APT will abort.</para></listitem>
+-->
+     <listitem><para>&dpkg; を呼び出す前後で実行するシェルコマンドのリストです。
+     <literal>options</literal> のようにリスト記法で指定しなければなりません。
+     コマンドは <filename>/bin/sh</filename> を使用して呼び出され、
+     何か問題があれば、APT は異常終了します。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Pre-Install-Pkgs</term>
+<!--
+     <listitem><para>This is a list of shell commands to run before invoking dpkg. Like
+     <literal>options</literal> this must be specified in list notation. The commands
+     are invoked in order using <filename>/bin/sh</filename>, should any fail APT 
+     will abort. APT will pass to the commands on standard input the 
+     filenames of all .deb files it is going to install, one per line.</para>
+-->
+     <listitem><para>&dpkg; を呼び出す前に実行するシェルコマンドのリストです。
+     <literal>options</literal> のようにリスト記法で指定しなければなりません。
+     コマンドは <filename>/bin/sh</filename> を通して呼び出され、
+     何か問題があれば、APT は異常終了します。
+     APT はインストールしようとする全 .deb ファイルのファイル名を、
+     ひとつずつコマンドの標準入力に送ります。</para>
+
+<!--
+     <para>Version 2 of this protocol dumps more information, including the 
+     protocol version, the APT configuration space and the packages, files
+     and versions being changed. Version 2 is enabled by setting 
+     <literal>DPkg::Tools::options::cmd::Version</literal> to 2. <literal>cmd</literal> is a
+     command given to <literal>Pre-Install-Pkgs</literal>.</para></listitem>
+-->
+     <para>このプロトコルのバージョン 2 では、(プロトコルのバージョンや 
+     APT 設定スペース、パッケージを含む) 詳細情報やファイル、
+     変更されているバージョンを出力します。
+     <literal>DPkg::Tools::options::cmd::Version</literal> に 2 を設定すると、
+     バージョン 2 を有効にできます。
+     <literal>cmd</literal> は <literal>Pre-Install-Pkgs</literal> 
+     で与えられるコマンドです。</para></listitem>
+          </varlistentry>
+
+     <varlistentry><term>Run-Directory</term>
+<!--
+     <listitem><para>APT chdirs to this directory before invoking dpkg, the default is 
+     <filename>/</filename>.</para></listitem>
+-->
+     <listitem><para>APT は dpkg を呼び出す前にこのディレクトリに移動します。
+     デフォルトは <filename>/</filename> です。</para></listitem>
+     </varlistentry>
+
+     <varlistentry><term>Build-options</term>
+<!--
+     <listitem><para>These options are passed to &dpkg-buildpackage; when compiling packages,
+     the default is to disable signing and produce all binaries.</para></listitem>
+-->
+     <listitem><para>これらのオプションは、
+     パッケージのコンパイル時に &dpkg-buildpackage; に渡されます。
+     デフォルトでは、署名を無効にし、全バイナリを生成します。</para></listitem>
+     </varlistentry>
+   </variablelist>
+ </refsect1>
+
+<!--
+ <refsect1><title>Debug options</title>
+-->
+ <refsect1><title>デバッグオプション</title>
+<!--
+   <para>Most of the options in the <literal>debug</literal> section are not interesting to 
+   the normal user, however <literal>Debug::pkgProblemResolver</literal> shows 
+   interesting output about the decisions dist-upgrade makes. 
+   <literal>Debug::NoLocking</literal> disables file locking so APT can do some 
+   operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the 
+   command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will 
+   disable the inclusion of statfs data in CDROM IDs.
+   <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
+   </para>
+-->
+   <para><literal>debug</literal> の多くのオプションは、
+   普通のユーザにとって興味を引くものではありません。
+   しかし <literal>Debug::pkgProblemResolver</literal> で、
+   dist-upgrade の判断についての興味深い出力が得られます。
+   <literal>Debug::NoLocking</literal>は、
+   APT が非 root で操作できるようにファイルのロックを無効にしますし、
+   <literal>Debug::pkgDPkgPM</literal>は、
+   dpkg を呼ぶ際のコマンドラインを出力します。
+   <literal>Debug::IdentCdrom</literal> は、
+   CDROM ID の状態データの包含を無効にします。
+   <literal>Debug::Acquire::gpgv</literal> gpgv 法のデバッグです。
+   </para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>Examples</title>
+-->
+ <refsect1><title>例</title>
+<!--
+   <para>&configureindex; is a 
+   configuration file showing example values for all possible 
+   options.</para>
+-->
+   <para>&configureindex; に、全利用可能オプションのデフォルト値を参照できる、
+   設定ファイルのサンプルがあります。</para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>Files</title>
+-->
+ <refsect1><title>ファイル</title>
+   <para><filename>/etc/apt/apt.conf</filename></para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.</para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+ 
+</refentry>
+
diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index 495322997..3fa931ae5 100644
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -2,178 +2,327 @@
 
 <!-- Some common paths.. -->
 <!ENTITY docdir "/usr/share/doc/apt/">
-<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
-<!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
+<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</filename>">
+<!ENTITY aptconfdir "<filename>/etc/apt.conf</filename>">
 <!ENTITY statedir "/var/lib/apt">
 <!ENTITY cachedir "/var/cache/apt">
 
 <!-- Cross references to other man pages -->
-<!ENTITY apt-conf "<CiteRefEntry>
-    <RefEntryTitle><filename/apt.conf/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY apt-get "<CiteRefEntry>
-    <RefEntryTitle><command/apt-get/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-config "<CiteRefEntry>
-    <RefEntryTitle><command/apt-config/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-cdrom "<CiteRefEntry>
-    <RefEntryTitle><command/apt-cdrom/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-cache "<CiteRefEntry>
-    <RefEntryTitle><command/apt-cache/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-preferences "<CiteRefEntry>
-    <RefEntryTitle><command/apt_preferences/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY sources-list "<CiteRefEntry>
-    <RefEntryTitle><filename/sources.list/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY reportbug "<CiteRefEntry>
-    <RefEntryTitle><command/reportbug/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-buildpackage "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY gzip "<CiteRefEntry>
-    <RefEntryTitle><command/gzip/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-scanpackages "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-scansources "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dselect "<CiteRefEntry>
-    <RefEntryTitle><command/dselect/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
+<!ENTITY apt-conf "<citerefentry>
+    <refentrytitle><filename>apt.conf</filename></refentrytitle>
+    <manvolnum>5</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-get "<citerefentry>
+    <refentrytitle><command>apt-get</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-config "<citerefentry>
+    <refentrytitle><command>apt-config</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-cdrom "<citerefentry>
+    <refentrytitle><command>apt-cdrom</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-cache "<citerefentry>
+    <refentrytitle><command>apt-cache</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-preferences "<citerefentry>
+    <refentrytitle><command>apt_preferences</command></refentrytitle>
+    <manvolnum>5</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-key "<citerefentry>
+    <refentrytitle><command>apt-key</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-secure "<citerefentry>
+    <refentrytitle>apt-secure</refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY apt-archive "<citerefentry>
+    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+
+<!ENTITY sources-list "<citerefentry>
+    <refentrytitle><filename>sources.list</filename></refentrytitle>
+    <manvolnum>5</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY reportbug "<citerefentry>
+    <refentrytitle><command>reportbug</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY dpkg "<citerefentry>
+    <refentrytitle><command>dpkg</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY dpkg-buildpackage "<citerefentry>
+    <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY gzip "<citerefentry>
+    <refentrytitle><command>gzip</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY dpkg-scanpackages "<citerefentry>
+    <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY dpkg-scansources "<citerefentry>
+    <refentrytitle><command>dpkg-scansources</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY dselect "<citerefentry>
+    <refentrytitle><command>dselect</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY aptitude "<citerefentry>
+    <refentrytitle><command>aptitude</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY synaptic "<citerefentry>
+    <refentrytitle><command>synaptic</command></refentrytitle>
+    <manvolnum>8</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY debsign "<citerefentry>
+    <refentrytitle><command>debsign</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY debsig-verify "<citerefentry>
+    <refentrytitle><command>debsig-verify</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY gpg "<citerefentry>
+    <refentrytitle><command>gpg</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
     
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
- <docinfo>
-   <address><email>apt@packages.debian.org</></address>
-   <author><firstname>Jason</> <surname>Gunthorpe</></>
-   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>
-   <date>12 March 2001</>
- </docinfo>
+ <refentryinfo>
+   <address><email>apt@packages.debian.org</email></address>
+   <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
+   <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
+   <date>14 December 2003</date>
+   <productname>Linux</productname>
+
+ </refentryinfo>
 "> 
 
+<!ENTITY apt-email "
+   <address>
+    <email>apt@packages.debian.org</email>
+   </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+   <author>
+    <firstname>Jason</firstname>
+    <surname>Gunthorpe</surname>
+   </author>
+">
+
+<!ENTITY apt-author.team "
+   <author>
+    <othername>APT team</othername>
+   </author>
+">
+
+<!ENTITY apt-product "
+   <productname>Linux</productname>
+">
+
+<!ENTITY apt-email "
+   <address>
+    <email>apt@packages.debian.org</email>
+   </address>
+">
+
+<!ENTITY apt-author.jgunthorpe "
+   <author>
+    <firstname>Jason</firstname>
+    <surname>Gunthorpe</surname>
+   </author>
+">
+
+<!ENTITY apt-author.team "
+   <author>
+    <othername>APT team</othername>
+   </author>
+">
+
+<!ENTITY apt-copyright "
+    <copyright>
+     <holder>Jason Gunthorpe</holder>
+     <year>1998-2001</year>
+    </copyright>
+">
+
+<!ENTITY apt-product "
+   <productname>Linux</productname>
+">
+
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
- <RefSect1><Title>�Х�</>
-   <para>
-   <ulink url='http://bugs.debian.org/apt'>APT �Х��ڡ���</>��
-   ���Ȥ��Ƥ���������
-   APT �ΥХ�����𤹤���ϡ�
-   <filename>/usr/share/doc/debian/bug-reporting.txt</> �� 
-   &reportbug; ���ޥ�ɤ򻲾Ȥ��Ƥ���������
+<!--
+ <refsect1><title>Bugs</title>
+-->
+ <refsect1><title>バグ</title>
+<!--
+   <para><ulink url='http://bugs.debian.org/src:apt'>APT bug page</ulink>. 
+   If you wish to report a bug in APT, please see
+   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> or the
+   &reportbug; command.
    </para>
- </RefSect1>
+-->
+   <para><ulink url='http://bugs.debian.org/src:apt'>APT バグページ</ulink>を
+   ご覧ください。
+   APT のバグを報告する場合は、
+   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> や
+   &reportbug; コマンドをご覧ください。
+   </para>
+ </refsect1>
 ">
 
 <!-- Boiler plate Author section -->
 <!ENTITY manauthor "
- <RefSect1><Title>����</>
-   <para>
-   APT �� the APT team <email>apt@packages.debian.org</> �ˤ�äƽ񤫤�ޤ�����
+<!--
+ <refsect1><title>Author</title>
+-->
+ <refsect1><title>著者</title>
+<!--
+   <para>APT was written by the APT team <email>apt@packages.debian.org</email>.
+-->
+   <para>APT は the APT team <email>apt@packages.debian.org</email> によって
+   書かれました。
    </para>
- </RefSect1>
+ </refsect1>
 ">
 
-<!-- Translator section (Kurasawa Add)-->
+<!-- Boiler plate Translator section (nabetaro add)-->
 <!ENTITY translator "
- <RefSect1><Title>������</>
-    <para>
-    ��߷ ˾ <email>nabetaro@mx1.avis.ne.jp</> (2003-2004)
-    </para>
-    <para>
-    Debian JP Documentation ML <email>debian-doc@debian.or.jp</>
-    </para>
- </RefSect1>
+ <refsect1><title>訳者</title>
+   <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006),
+   Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
+   </para>
+ </refsect1>
 ">
 
 <!-- Should be used within the option section of the text to
      put in the blurb about -h, -v, -c and -o -->
 <!ENTITY apt-commonoptions "
-     <VarListEntry><term><option/-h/</><term><option/--help/</>
-     <ListItem><Para>
-     �Ȥ�����û�������ɽ�����ޤ���
-     </Para></ListItem>
-     </VarListEntry>
+     <varlistentry><term><option>-h</option></term>
+     <term><option>--help</option></term>
+<!--
+     <listitem><para>Show a short usage summary.
+-->
+     <listitem><para>使い方の短い要約を表示します。
+     </para>
+     </listitem>
+     </varlistentry>
      
-     <VarListEntry><term><option/-v/</><term><option/--version/</>
-     <ListItem><Para>
-     �ץ������ΥС�������ɽ�����ޤ���
-     </Para></ListItem>
-     </VarListEntry>
-
-     <VarListEntry><term><option/-c/</><term><option/--config-file/</>
-     <ListItem><Para>
+     <varlistentry>
+      <term><option>-v</option></term>
+      <term><option>--version</option></term>
 <!--
-     Configuration File; Specify a configuration file to use. 
+      <listitem><para>Show the program version.
+-->
+      <listitem><para>プログラムのバージョンを表示します。
+     </para>
+     </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>-c</option></term>
+      <term><option>--config-file</option></term>
+<!--
+     <listitem><para>Configuration File; Specify a configuration file to use. 
      The program will read the default configuration file and then this 
      configuration file. See &apt-conf; for syntax information.     
+     </para>
 -->
-     ����ե����롣 ���Ѥ�������ե��������ꤷ�ޤ���
-     ��������ե����뤬�ɤ�ʤ����ϥǥե���Ȥ�����ե�������ɤ߹��ߤޤ���
-     ʸˡ�ξ���� &apt-conf; �򻲾Ȥ��Ƥ���������
-     </Para></ListItem>
-     </VarListEntry>
+     <listitem><para>設定ファイル。 使用する設定ファイルを指定します。
+     この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。
+     文法については &apt-conf; を参照してください。
+     </para>
+     </listitem>
+     </varlistentry>
      
-     <VarListEntry><term><option/-o/</><term><option/--option/</>
-     <ListItem><Para>
+     <varlistentry>
+      <term><option>-o</option></term>
+      <term><option>--option</option></term>
 <!--
-     Set a Configuration Option; This will set an arbitary configuration 
-     option. The syntax is <option>-o Foo::Bar=bar</>.
+     <listitem><para>Set a Configuration Option; This will set an arbitary
+      configuration option. The syntax is <option>-o Foo::Bar=bar</option>.
+     </para>
 -->
-     ���ꥪ�ץ����Υ��å� -  Ǥ�դ����ꥪ�ץ����򥻥åȤ��ޤ���
-     ʸˡ�� <option>-o Foo::Bar=bar</> �Ȥʤ�ޤ���
-     </Para></ListItem>
-     </VarListEntry>
+     <listitem><para>設定オプションのセット。任意の設定オプションをセットします。
+     文法は <option>-o Foo::Bar=bar</option> となります。
+     </para>
+     </listitem>
+     </varlistentry>
 ">
 
 <!-- Should be used within the option section of the text to
      put in the blurb about -h, -v, -c and -o -->
 <!ENTITY apt-cmdblurb "
-   <para>
 <!--
-   All command line options may be set using the configuration file, the
+   <para>All command line options may be set using the configuration file, the
    descriptions indicate the configuration option to set. For boolean
    options you can override the config file by using something like 
-   <option/-f-/,<option/- -no-f/, <option/-f=no/ or several other variations.
+   <option>-f-</option>,<option>-\-no-f</option>, <option>-f=no</option>
+   or several other variations.
+   </para>
 -->
-   ���������Ǽ��������ץ����ϡ����٤�����ե��������Ѥ�������Ǥ��ޤ���
-   ����ե�����˽񤤤������ͤ�Ȥ륪�ץ����� <option/-f-/,<option/--no-f/, 
-   <option/-f=no/ �ʤɤΤ褦�ˤ��ƾ�񤭤��뤳�Ȥ��Ǥ��ޤ���
+   <para>この説明で示したオプションは、
+   すべて設定ファイルを使用して設定できます。
+   設定ファイルに書いた真偽値をとるオプションは
+   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>
+   などのようにして上書きできます。
    </para>
 ">
+
diff --git a/doc/ja/apt_preferences.ja.5.xml b/doc/ja/apt_preferences.ja.5.xml
new file mode 100644
index 000000000..a7e63a961
--- /dev/null
+++ b/doc/ja/apt_preferences.ja.5.xml
@@ -0,0 +1,940 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+
+ <refmeta>
+   <refentrytitle>apt_preferences</refentrytitle>
+   <manvolnum>5</manvolnum>
+ </refmeta>
+
+ <!-- Man page title -->
+ <refnamediv>
+    <refname>apt_preferences</refname>
+<!--
+    <refpurpose>Preference control file for APT</refpurpose>
+-->
+    <refpurpose>APT 設定制御ファイル</refpurpose>
+ </refnamediv>
+
+<refsect1>
+<!--
+<title>Description</title>
+-->
+<title>説明</title>
+<!--
+<para>The APT preferences file <filename>/etc/apt/preferences</filename>
+can be used to control which versions of packages will be selected
+for installation.</para>
+-->
+<para>APT 設定ファイル <filename>/etc/apt/preferences</filename> は、
+インストールするパッケージのバージョン選択を制御するのに使用します。</para>
+
+<!--
+<para>Several versions of a package may be available for installation when
+the &sources-list; file contains references to more than one distribution
+(for example, <literal>stable</literal> and <literal>testing</literal>).
+APT assigns a priority to each version that is available.
+Subject to dependency constraints, <command>apt-get</command> selects the
+version with the highest priority for installation.
+The APT preferences file overrides the priorities that APT assigns to
+package versions by default, thus giving the user control over which
+one is selected for installation.</para>
+-->
+<para>&sources-list; ファイルに複数のディストリビューション 
+(<literal>stable</literal> と <literal>testing</literal> など) 
+が指定されていて、
+パッケージに対し複数のバージョンがインストールできることがあります。
+このとき APT は、利用できるバージョンごとに優先度を割り当てます。
+依存関係規則を条件として、<command>apt-get</command> は、
+最も高い優先度を持つバージョンをインストールするよう選択します。
+APT 設定ファイルは、APT がデフォルトで割り当てた、
+パッケージのバージョンの優先度を上書きします。
+その結果、インストールするものの選択を、ユーザが選択できるようになります。</para>
+
+<!--
+<para>Several instances of the same version of a package may be available when
+the &sources-list; file contains references to more than one source.
+In this case <command>apt-get</command> downloads the instance listed
+earliest in the &sources-list; file.
+The APT preferences file does not affect the choice of instance, only
+the choice of version.</para>
+-->
+<para>&sources-list; ファイルに複数の参照が書かれている場合、
+パッケージの同じバージョンのインスタンスが複数利用できる可能性があります。
+この場合、<command>apt-get</command> は &sources-list; 
+ファイルの初めの方に指定されているところからダウンロードします。
+APT 設定ファイルは、バージョンの選択にのみ影響し、
+インスタンスの選択には影響しません。</para>
+
+<!--
+<refsect2><title>APT's Default Priority Assignments</title>
+-->
+<refsect2><title>APT のデフォルト優先度の割り当て</title>
+
+<!--
+<para>If there is no preferences file or if there is no entry in the file
+that applies to a particular version then the priority assigned to that
+version is the priority of the distribution to which that version
+belongs.  It is possible to single out a distribution, "the target release",
+which receives a higher priority than other distributions do by default.
+The target release can be set on the <command>apt-get</command> command
+line or in the APT configuration file <filename>/etc/apt/apt.conf</filename>.
+For example,
+-->
+<para>設定ファイルがなかったり、
+設定ファイルに、特定のパッケージを割り当てるエントリがない場合、
+そのバージョンの優先度は、
+そのバージョンが属しているディストリビューションの優先度となります。
+デフォルトで他のディストリビューションより高い優先度を持つ、
+特定のディストリビューションを「ターゲットリリース」としておくのは可能です。
+ターゲットリリースは、<command>apt-get</command> のコマンドラインで設定したり、
+APT 設定ファイル <filename>/etc/apt/apt.conf</filename> で設定したりできます。
+例えば以下のようになります。
+
+<programlisting>
+<command>apt-get install -t testing <replaceable>some-package</replaceable></command>
+</programlisting>
+<programlisting>
+APT::Default-Release "stable";
+</programlisting>
+</para>
+
+<!--
+<para>If the target release has been specified then APT uses the following
+algorithm to set the priorities of the versions of a package.  Assign:
+-->
+<para>ターゲットリリースが指定されると、APT は以下のアルゴリズムで、
+パッケージのバージョンの優先度を設定します。このように割り当てます。
+
+<variablelist>
+<varlistentry>
+<!--
+<term>priority 100</term>
+-->
+<term>優先度 100</term>
+<!--
+<listitem><simpara>to the version that is already installed (if any).</simpara></listitem>
+-->
+<listitem><simpara>(あるならば) 既にインストールされているバージョン。</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>priority 500</term>
+-->
+<term>優先度 500</term>
+<!--
+<listitem><simpara>to the versions that are not installed and do not belong to the target release.</simpara></listitem>
+-->
+<listitem><simpara>インストールされておらず、ターゲットリリースに含まれないバージョン。</simpara></listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>priority 990</term>
+-->
+<term>優先度 990</term>
+<!--
+<listitem><simpara>to the versions that are not installed and belong to the target release.</simpara></listitem>
+-->
+<listitem><simpara>インストールされておらず、ターゲットリリースに含まれるバージョン。</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>If the target release has not been specified then APT simply assigns
+priority 100 to all installed package versions and priority 500 to all
+uninstalled package versions.</para>
+-->
+<para>ターゲットリリースが指定されていなければ、
+APT は単純にインストールしているパッケージのバージョンには 100 を、
+インストールしていないパッケージのバージョンには 500 を割り当てます。</para>
+
+<!--
+<para>APT then applies the following rules, listed in order of precedence,
+to determine which version of a package to install.
+-->
+<para>APT は、インストールするパッケージのバージョンを決定するために、
+以下のルールを上から順番に適用します。
+<itemizedlist>
+<!--
+<listitem><simpara>Never downgrade unless the priority of an available
+version exceeds 1000.  ("Downgrading" is installing a less recent version
+of a package in place of a more recent version.  Note that none of APT's
+default priorities exceeds 1000; such high priorities can only be set in
+the preferences file.  Note also that downgrading a package
+can be risky.)</simpara></listitem>
+-->
+<listitem><simpara>有効なバージョンの優先度が 1000 を越えない場合、
+決してダウングレードしません。
+(「ダウングレード」は、現在のパッケージのバージョンよりも、
+小さいバージョンのものをインストールします。
+APT のデフォルト優先度が 1000 を越えないことに注意してください。
+そのような優先度は設定ファイルでのみ設定できます。
+また、パッケージのダウングレードは危険であることにも注意してください)</simpara></listitem>
+<!--
+<listitem><simpara>Install the highest priority version.</simpara></listitem>
+-->
+<listitem><simpara>最も高い優先度のバージョンをインストールします。</simpara></listitem>
+<!--
+<listitem><simpara>If two or more versions have the same priority,
+install the most recent one (that is, the one with the higher version
+number).</simpara></listitem>
+-->
+<listitem><simpara>同じ優先度のバージョンが複数存在する場合、
+最も新しいもの (最もバージョン番号が高いもの) をインストールします。</simpara></listitem>
+<!--
+<listitem><simpara>If two or more versions have the same priority and
+version number but either the packages differ in some of their metadata or the
+<literal>-\-reinstall</literal> option is given, install the uninstalled one.</simpara></listitem>
+-->
+<listitem><simpara>優先度・バージョン番号が同じものが複数存在し、
+そのパッケージのメタデータが異なるか <literal>--reinstall</literal> 
+オプションが与えられている場合、
+インストールされていないものをインストールします。</simpara></listitem>
+</itemizedlist>
+</para>
+
+<!--
+<para>In a typical situation, the installed version of a package (priority 100)
+is not as recent as one of the versions available from the sources listed in
+the &sources-list; file (priority 500 or 990).  Then the package will be upgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed.
+-->
+<para>よくある状況として、
+あるインストールされているパッケージのバージョン (優先度 100) が、
+&sources-list; ファイルのリストから得られるバージョン (優先度 500 か 990) 
+よりも新しくないということがあります。この場合、
+<command>apt-get install <replaceable>some-package</replaceable></command>
+や <command>apt-get upgrade</command> を実行するとパッケージが更新されます。
+</para>
+
+<!--
+<para>More rarely, the installed version of a package is <emphasis>more</emphasis> recent
+than any of the other available versions.  The package will not be downgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed.</para>
+-->
+<para>まれに、インストールされているパッケージのバージョンが、
+<emphasis>他の有効なバージョンよりも</emphasis>新しい場合があります。
+この時
+<command>apt-get install <replaceable>some-package</replaceable></command>
+や <command>apt-get upgrade</command> を実行しても、
+ダウングレードしません。</para>
+
+<!--
+<para>Sometimes the installed version of a package is more recent than the
+version belonging to the target release, but not as recent as a version
+belonging to some other distribution.  Such a package will indeed be upgraded
+when <command>apt-get install <replaceable>some-package</replaceable></command>
+or <command>apt-get upgrade</command> is executed,
+because at least <emphasis>one</emphasis> of the available versions has a higher
+priority than the installed version.</para>
+-->
+<para>時々、インストールしているパッケージのバージョンが、
+ターゲットリリースに属するバージョンよりも新しく、
+他のディストリビューションよりも古い場合があります。
+そのようなパッケージに対して
+<command>apt-get install <replaceable>some-package</replaceable></command>
+や <command>apt-get upgrade</command> を実行すると、
+パッケージは更新されます。
+この場合、インストールされているバージョンよりも、
+少なくとも<emphasis>ひとつ</emphasis>は、
+高い優先度を持つ有効なパッケージがあるからです。</para>
+</refsect2>
+
+<!--
+<refsect2><title>The Effect of APT Preferences</title>
+-->
+<refsect2><title>APT 設定の効果</title>
+
+<!--
+<para>The APT preferences file allows the system administrator to control the
+assignment of priorities.  The file consists of one or more multi-line records
+separated by blank lines.  Records can have one of two forms, a specific form
+and a general form.
+-->
+<para>APT 設定ファイルを使うと、
+システム管理者が優先度を割り当てられるようになります。
+ファイルは、空白行で区切られた、複数行からなるレコードで構成されています。
+レコードは特定形式か、汎用形式のどちらかの形式をとります。
+<itemizedlist>
+<listitem>
+<!--
+<simpara>The specific form assigns a priority (a "Pin-Priority") to a
+specified package and specified version or version range.  For example,
+the following record assigns a high priority to all versions of
+the <filename>perl</filename> package whose version number begins with "<literal>5.8</literal>".</simpara>
+-->
+<simpara>特定形式は、優先度 ("Pin-Priority") を、
+指定したパッケージの指定したバージョン (範囲) について割り当てます。
+例えば以下のレコードは、
+"<literal>5.8</literal>" で始まる <filename>perl</filename> パッケージを、
+高い優先度に設定します。</simpara>
+
+<programlisting>
+Package: perl
+Pin: version 5.8*
+Pin-Priority: 1001
+</programlisting>
+</listitem>
+
+<!--
+<listitem><simpara>The general form assigns a priority to all of the package versions in a
+given distribution (that is, to all the versions of packages that are
+listed in a certain <filename>Release</filename> file) or to all of the package
+versions coming from a particular Internet site, as identified by the
+site's fully qualified domain name.</simpara>
+-->
+<listitem><simpara>汎用形式は、与えられたディストリビューションにある、
+すべてのパッケージ (<filename>Release</filename> ファイルに列挙したパッケージ)
+の優先度や、FQDNで指定した、
+特定のインターネットサイトから取得するパッケージの優先度を割り当てます。</simpara>
+
+<!--
+<simpara>This general-form entry in the APT preferences file applies only
+to groups of packages.  For example, the following record assigns a high
+priority to all package versions available from the local site.</simpara>
+-->
+<simpara>APT 設定ファイルに書かれている汎用形式のエントリは、
+パッケージのグループについてのみ適用されます。
+例えば以下のレコードは、ローカルサイトにある全パッケージについて、
+高い優先度を割り当てます。</simpara>
+
+<programlisting>
+Package: *
+Pin: origin ""
+Pin-Priority: 999
+</programlisting>
+
+<!--
+<simpara>A note of caution: the keyword used here is "<literal>origin</literal>".
+This should not be confused with the Origin of a distribution as
+specified in a <filename>Release</filename> file.  What follows the "Origin:" tag
+in a <filename>Release</filename> file is not an Internet address
+but an author or vendor name, such as "Debian" or "Ximian".</simpara>
+-->
+<simpara>注: ここで使用しているキーワードは "<literal>origin</literal>" です。
+<filename>Release</filename> ファイルに指定されたような、
+ディストリビューションの Origin と混同しないようにしてください。
+<filename>Release</filename> ファイルにある "Origin:" タグは、
+インターネットアドレスではなく、
+"Debian" や "Ximian" といった作者やベンダ名です。</simpara>
+
+<!--
+<simpara>The following record assigns a low priority to all package versions
+belonging to any distribution whose Archive name is "<literal>unstable</literal>".</simpara>
+-->
+<simpara>以下のレコードは、アーカイブ名が "<literal>unstable</literal>" 
+となっているディストリビューションに属するパッケージを、
+すべて低い優先度に割り当てます。</simpara>
+
+<programlisting>
+Package: *
+Pin: release a=unstable
+Pin-Priority: 50
+</programlisting>
+
+<!--
+<simpara>The following record assigns a high priority to all package versions
+belonging to any release whose Archive name is "<literal>stable</literal>"
+and whose release Version number is "<literal>3.0</literal>".</simpara>
+-->
+<simpara>以下のレコードは、アーカイブ名が "<literal>stable</literal>" で、
+リリースバージョン番号が "<literal>3.0</literal>" 
+となっているリリースに属するパッケージを、
+すべて高い優先度に割り当てます。</simpara>
+
+<programlisting>
+Package: *
+Pin: release a=stable, v=3.0
+Pin-Priority: 500
+</programlisting>
+</listitem>
+</itemizedlist>
+</para>
+
+</refsect2>
+
+<refsect2>
+<!--
+<title>How APT Interprets Priorities</title>
+-->
+<title>APT が優先度に割り込む方法</title>
+
+<para>
+<!--
+Priorities (P) assigned in the APT preferences file must be positive
+or negative integers.  They are interpreted as follows (roughly speaking):
+-->
+APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。
+これは (おおざっぱにいうと) 以下のように解釈されます。
+
+<variablelist>
+<varlistentry>
+<term>P &gt; 1000</term>
+<!--
+<listitem><simpara>causes a version to be installed even if this
+constitutes a downgrade of the package</simpara></listitem>
+-->
+<listitem><simpara>パッケージがダウングレードしても、このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>990 &lt; P &lt;=1000</term>
+<!--
+<listitem><simpara>causes a version to be installed
+even if it does not come from the target release,
+unless the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>インストールされているバージョンの方が新しいことを除き、
+ターゲットリリースに含まれなくても、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>500 &lt; P &lt;=990</term>
+<!--
+<listitem><simpara>causes a version to be installed
+unless there is a version available belonging to the target release
+or the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>ターゲットリリースに属するバージョンがあったり、
+インストールされているバージョンの方が新しいのでなければ、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>100 &lt; P &lt;=500</term>
+<!--
+<listitem><simpara>causes a version to be installed
+unless there is a version available belonging to some other
+distribution or the installed version is more recent</simpara></listitem>
+-->
+<listitem><simpara>他のディストリビューションに属するバージョンがあったり、
+インストールされているバージョンの方が新しいのでなければ、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>0 &lt; P &lt;=100</term>
+<!--
+<listitem><simpara>causes a version to be installed
+only if there is no installed version of the package</simpara></listitem>
+-->
+<listitem><simpara>このパッケージがインストールされていない場合、
+このバージョンのパッケージをインストールします。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<term>P &lt; 0</term>
+<!--
+<listitem><simpara>prevents the version from being installed</simpara></listitem>
+-->
+<listitem><simpara>このバージョンがインストールされないようにします。</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>If any specific-form records match an available package version then the
+first such record determines the priority of the package version.  
+Failing that,
+if any general-form records match an available package version then the
+first such record determines the priority of the package version.</para>
+-->
+<para>特定形式のレコードが利用可能パッケージバージョンに一致した場合、
+最初のレコードが、パッケージバージョンの優先度を決定します。
+失敗して、汎用形式のレコードが利用可能パッケージバージョンに一致した場合、
+最初のレコードが、パッケージバージョンの優先度を決定します。</para>
+
+<!--
+<para>For example, suppose the APT preferences file contains the three
+records presented earlier:</para>
+-->
+<para>例えば、APT 設定ファイルの上の方に、
+以下のレコードが書かれていると仮定してください。</para>
+
+<programlisting>
+Package: perl
+Pin: version 5.8*
+Pin-Priority: 1001
+
+Package: *
+Pin: origin ""
+Pin-Priority: 999
+
+Package: *
+Pin: release unstable
+Pin-Priority: 50
+</programlisting>
+
+<!--
+<para>Then:
+-->
+<para>すると、
+<itemizedlist>
+<!--
+<listitem><simpara>The most recent available version of the <literal>perl</literal>
+package will be installed, so long as that version's version number begins
+with "<literal>5.8</literal>".  If <emphasis>any</emphasis> 5.8* version of <literal>perl</literal> is
+available and the installed version is 5.9*, then <literal>perl</literal> will be
+downgraded.</simpara></listitem>
+-->
+<listitem><simpara>バージョン番号が "<literal>5.8</literal>" で始まっていれば、
+<literal>perl</literal> の最新の利用可能パッケージがインストールされます。
+バージョン 5.8* が利用可能で、バージョン 5.9* がインストールされている場合、
+<literal>perl</literal> はダウングレードされます。</simpara></listitem>
+<!--
+<listitem><simpara>A version of any package other than <literal>perl</literal>
+that is available from the local system has priority over other versions,
+even versions belonging to the target release.
+</simpara></listitem>
+-->
+<listitem><simpara>ローカルシステムで有効な、
+<literal>perl</literal> 以外のどんなパッケージでも、
+他のバージョンより (たとえターゲットリリースに属していても) 優先度が高くなります。
+</simpara></listitem>
+<!--
+<listitem><simpara>A version of a package whose origin is not the local
+system but some other site listed in &sources-list; and which belongs to
+an <literal>unstable</literal> distribution is only installed if it is selected
+for installation and no version of the package is already installed.
+</simpara></listitem>
+-->
+<listitem><simpara>ローカルシステムにはなくても &sources-list; 
+に列挙されたサイトにあるバージョンで、
+<literal>unstable</literal> ディストリビューションに属しているパッケージは、
+インストールするよう選択され、
+既にインストールされているバージョンがない場合にのみインストールされます。
+</simpara></listitem>
+</itemizedlist>
+</para>
+</refsect2>
+
+<refsect2>
+<!--
+<title>Determination of Package Version and Distribution Properties</title>
+-->
+<title>パッケージのバージョンとディストリビューションプロパティの決定</title>
+
+<!--
+<para>The locations listed in the &sources-list; file should provide
+<filename>Packages</filename> and <filename>Release</filename> files
+to describe the packages available at that location. </para>
+-->
+<para>&sources-list; ファイルに列挙した場所では、
+その場所で利用できるパッケージを記述した、
+<filename>Packages</filename> ファイルや 
+<filename>Release</filename> ファイルを提供します。</para>
+
+<!--
+<para>The <filename>Packages</filename> file is normally found in the directory
+<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>:
+for example, <filename>.../dists/stable/main/binary-i386/Packages</filename>.
+It consists of a series of multi-line records, one for each package available
+in that directory.  Only two lines in each record are relevant for setting
+APT priorities:
+-->
+<para><filename>Packages</filename> ファイルは通常
+<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename> 
+ディレクトリにあります。
+例えば、<filename>.../dists/stable/main/binary-i386/Packages</filename> です。
+これは、ディレクトリにある利用可能パッケージごとに、
+複数行のレコードからできています。
+APT 優先度の設定は、レコードごとに以下の 2 行だけです。
+<variablelist>
+<varlistentry>
+<!--
+<term>the <literal>Package:</literal> line</term>
+<listitem><simpara>gives the package name</simpara></listitem>
+-->
+<term><literal>Package:</literal> 行</term>
+<listitem><simpara>パッケージ名を与えます。</simpara></listitem>
+</varlistentry>
+<varlistentry>
+<!--
+<term>the <literal>Version:</literal> line</term>
+<listitem><simpara>gives the version number for the named package</simpara></listitem>
+-->
+<term><literal>Version:</literal> 行</term>
+<listitem><simpara>その名前のパッケージのバージョン番号を与えます。</simpara></listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>The <filename>Release</filename> file is normally found in the directory
+<filename>.../dists/<replaceable>dist-name</replaceable></filename>:
+for example, <filename>.../dists/stable/Release</filename>,
+or <filename>.../dists/woody/Release</filename>.
+It consists of a single multi-line record which applies to <emphasis>all</emphasis> of
+the packages in the directory tree below its parent.  Unlike the
+<filename>Packages</filename> file, nearly all of the lines in a <filename>Release</filename>
+file are relevant for setting APT priorities:
+-->
+<para><filename>Release</filename> ファイルは、通常
+<filename>.../dists/<replaceable>dist-name</replaceable></filename> 
+にあります。例えば、
+<filename>.../dists/stable/Release</filename>, 
+<filename>.../dists/woody/Release</filename> です。
+これは、このディレクトリ以下にある<emphasis>全</emphasis>パッケージに適用する、
+複数行のレコード 1 つから成っています。
+<filename>Packages</filename> と違い <filename>Release</filename> ファイルは、
+ほとんどの行が APT 優先度の設定に関連します。
+
+<variablelist>
+<varlistentry>
+<!--
+<term>the <literal>Archive:</literal> line</term>
+-->
+<term><literal>Archive:</literal> 行</term>
+<!--
+<listitem><simpara>names the archive to which all the packages
+in the directory tree belong.  For example, the line
+"Archive: stable"
+specifies that all of the packages in the directory
+tree below the parent of the <filename>Release</filename> file are in a
+<literal>stable</literal> archive.  Specifying this value in the APT preferences file
+would require the line:
+-->
+<listitem><simpara>このディレクトリツリーに属する全パッケージのアーカイブ名。
+例えば、
+"Archive: stable"
+という行は、<filename>Release</filename> ファイルの親ディレクトリツリー以下にある全パッケージが、
+<literal>stable</literal> アーカイブだと指定します。
+APT 設定ファイルでこの値を指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release a=stable
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Version:</literal> line</term>
+-->
+<term><literal>Version:</literal> 行</term>
+<!--
+<listitem><simpara>names the release version.  For example, the
+packages in the tree might belong to Debian GNU/Linux release
+version 3.0.  Note that there is normally no version number for the
+<literal>testing</literal> and <literal>unstable</literal> distributions because they
+have not been released yet.  Specifying this in the APT preferences
+file would require one of the following lines.
+-->
+<listitem><simpara>リリースバージョン名。
+例えば、このツリーのパッケージが、
+GNU/Linux リリースバージョン 3.0 に属するとします。
+通常 <literal>testing</literal> ディストリビューションや
+<literal>unstable</literal> ディストリビューションには、
+まだリリースされていないので、バージョン番号が付きません。
+APT 設定ファイルでこれを指定するには、以下の行のいずれかが必要になります。
+</simpara>
+
+<programlisting>
+Pin: release v=3.0
+Pin: release a=stable, v=3.0
+Pin: release 3.0
+</programlisting>
+
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Component:</literal> line</term>
+-->
+<term><literal>Component:</literal> 行</term>
+<!--
+<listitem><simpara>names the licensing component associated with the
+packages in the directory tree of the <filename>Release</filename> file.
+For example, the line "Component: main" specifies that
+all the packages in the directory tree are from the <literal>main</literal>
+component, which entails that they are licensed under terms listed
+in the Debian Free Software Guidelines.  Specifying this component
+in the APT preferences file would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルの、
+ディレクトリツリーにあるパッケージのライセンスコンポーネント名。
+例えば、"Component: main" という行は、このディレクトリ以下の全ファイルが、
+<literal>main</literal> コンポーネント 
+(Debian フリーソフトウェアガイドラインの元でライセンスされている) 
+であることを表します。
+APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release c=main
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Origin:</literal> line</term>
+-->
+<term><literal>Origin:</literal> 行</term>
+<!--
+<listitem><simpara>names the originator of the packages in the
+directory tree of the <filename>Release</filename> file.  Most commonly, this is
+<literal>Debian</literal>.  Specifying this origin in the APT preferences file
+would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルのディレクトリツリーにあるパッケージの提供者名。
+ほとんど共通で、<literal>Debian</literal> です。
+APT 設定ファイルでこの提供者を指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release o=Debian
+</programlisting>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<!--
+<term>the <literal>Label:</literal> line</term>
+-->
+<term><literal>Label:</literal> 行</term>
+<!--
+<listitem><simpara>names the label of the packages in the directory tree
+of the <filename>Release</filename> file.  Most commonly, this is
+<literal>Debian</literal>.  Specifying this label in the APT preferences file
+would require the line:
+-->
+<listitem><simpara><filename>Release</filename> ファイルのディレクトリツリーにあるパッケージのラベル名。
+ほとんど共通で <literal>Debian</literal> です。
+APT 設定ファイルでこのラベルを指定するには、以下の行が必要になります。
+</simpara>
+<programlisting>
+Pin: release l=Debian
+</programlisting>
+</listitem>
+</varlistentry>
+</variablelist>
+</para>
+
+<!--
+<para>All of the <filename>Packages</filename> and <filename>Release</filename>
+files retrieved from locations listed in the &sources-list; file are stored
+in the directory <filename>/var/lib/apt/lists</filename>, or in the file named
+by the variable <literal>Dir::State::Lists</literal> in the <filename>apt.conf</filename> file.
+For example, the file
+<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename>
+contains the <filename>Release</filename> file retrieved from the site
+<literal>debian.lcs.mit.edu</literal> for <literal>binary-i386</literal> architecture
+files from the <literal>contrib</literal> component of the <literal>unstable</literal>
+distribution.</para>
+-->
+<para>&sources-list; ファイルに列挙された場所から取得した 
+<filename>Packages</filename> ファイルや 
+<filename>Release</filename> ファイルはすべて、
+<filename>/var/lib/apt/lists</filename> ディレクトリや、
+<filename>apt.conf</filename> ファイルの 
+<literal>Dir::State::Lists</literal> 変数で指定した場所に取得されます。例えば、
+<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename> ファイルは、
+<literal>debian.lcs.mit.edu</literal> から取得した、
+<literal>unstable</literal> ディストリビューションで、
+<literal>contrib</literal> コンポーネントな、
+<literal>binary-i386</literal> アーキテクチャ用の 
+<filename>Release</filename> ファイルを含んでいます。</para>
+</refsect2>
+
+<refsect2>
+<!--
+<title>Optional Lines in an APT Preferences Record</title>
+-->
+<title>APT 設定レコードのオプション行</title>
+
+<!--
+<para>Each record in the APT preferences file can optionally begin with
+one or more lines beginning with the word <literal>Explanation:</literal>.
+This provides a place for comments.</para>
+-->
+<para>APT 設定ファイルのレコードごとに、
+任意で <literal>Explanation:</literal> で始まる行を持てます。
+これは、コメント用の場所を確保します。</para>
+
+<!--
+<para>The <literal>Pin-Priority:</literal> line in each APT preferences record is
+optional.  If omitted, APT assigs a priority of 1 less than the last value
+specified on a line beginning with <literal>Pin-Priority: release ...</literal>.</para>
+-->
+<para>APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。
+省略すると、<literal>Pin-Priority: release ...</literal> 
+で始まる行で指示した最後の値 (少なくとも1つ) を優先度に割り当てます。</para>
+</refsect2>
+</refsect1>
+
+<refsect1>
+<!--
+<title>Examples</title>
+-->
+<title>サンプル</title>
+<refsect2>
+<!--
+<title>Tracking Stable</title>
+-->
+<title>安定版を追跡</title>
+
+<!--
+<para>The following APT preferences file will cause APT to assign a
+priority higher than the default (500) to all package versions belonging
+to a <literal>stable</literal> distribution and a prohibitively low priority to
+package versions belonging to other <literal>Debian</literal> distributions.
+-->
+<para>以下の APT 設定ファイルは、<literal>stable</literal> 
+ディストリビューションに属する全てのパッケージのバージョンに、
+デフォルト (500) より高い優先度を割り当て、
+他の <literal>Debian</literal> 
+ディストリビューションのパッケージのバージョンには、
+低くてインストールできないような優先度を割り当てます。
+
+<programlisting>
+Explanation: Uninstall or do not install any Debian-originated
+Explanation: package versions other than those in the stable distro
+Package: *
+Pin: release a=stable
+Pin-Priority: 900
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<!--
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the
+latest <literal>stable</literal> version(s).
+-->
+<para>適切な &sources-list; ファイルと上記の設定ファイルにより、
+以下のコマンドで最新の <literal>stable</literal> 
+バージョンにアップグレードできます。
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<!--
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>testing</literal> distribution;
+the package will not be upgraded again unless this command is given
+again.
+-->
+<para>以下のコマンドで、指定したパッケージを <literal>testing</literal> 
+ディストリビューションの最新バージョンにアップグレードします。
+このパッケージは、再度このコマンドを発行しないとアップグレードされません。
+
+<programlisting>
+apt-get install <replaceable>package</replaceable>/testing
+</programlisting>
+</para>
+</refsect2>
+
+ <refsect2>
+<!--
+ <title>Tracking Testing or Unstable</title>
+-->
+ <title>テスト版や不安定版を追跡</title>
+
+<!--
+<para>The following APT preferences file will cause APT to assign
+a high priority to package versions from the <literal>testing</literal>
+distribution, a lower priority to package versions from the
+<literal>unstable</literal> distribution, and a prohibitively low priority
+to package versions from other <literal>Debian</literal> distributions.
+-->
+<para>以下の APT 設定ファイルは、<literal>testing</literal> 
+ディストリビューションのパッケージのバージョンに高い優先度を割り当て、
+<literal>unstable</literal> 
+ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。
+また他の <literal>Debian</literal> 
+ディストリビューションのパッケージのバージョンには、
+低くてインストールできないような優先度を割り当てます。
+
+<programlisting>
+Package: *
+Pin: release a=testing
+Pin-Priority: 900
+
+Package: *
+Pin: release a=unstable
+Pin-Priority: 800
+
+Package: *
+Pin: release o=Debian
+Pin-Priority: -10
+</programlisting>
+</para>
+
+<!--
+<para>With a suitable &sources-list; file and the above preferences file,
+any of the following commands will cause APT to upgrade to the latest
+<literal>testing</literal> version(s).
+-->
+<para>適切な &sources-list; ファイルと上記の設定ファイルにより、
+以下のコマンドで最新の <literal>testing</literal> 
+バージョンにアップグレードできます。
+
+<programlisting>
+apt-get install <replaceable>package-name</replaceable>
+apt-get upgrade
+apt-get dist-upgrade
+</programlisting>
+</para>
+
+<!--
+<para>The following command will cause APT to upgrade the specified
+package to the latest version from the <literal>unstable</literal> distribution.
+Thereafter, <command>apt-get upgrade</command> will upgrade
+the package to the most recent <literal>testing</literal> version if that is
+more recent than the installed version, otherwise, to the most recent
+<literal>unstable</literal> version if that is more recent than the installed
+version.
+-->
+<para>以下のコマンドで、指定したパッケージを <literal>unstable</literal> 
+ディストリビューションの最新バージョンにアップグレードします。
+それ以降、<command>apt-get upgrade</command> は
+<literal>testing</literal> バージョンのパッケージが更新されていれば 
+<literal>testing</literal> の最新版に、
+<literal>unstable</literal> バージョンのパッケージが更新されていれば 
+<literal>unstable</literal>の最新版にアップグレードします。
+
+<programlisting>
+apt-get install <replaceable>package</replaceable>/unstable
+</programlisting>
+</para>
+
+</refsect2>
+</refsect1>
+
+<refsect1>
+<!--
+<title>See Also</title>
+-->
+<title>関連項目</title>
+<para>&apt-get; &apt-cache; &apt-conf; &sources-list;
+</para>
+</refsect1>
+
+ &manbugs;
+ &translator;
+
+</refentry>
+
diff --git a/doc/ja/makefile b/doc/ja/makefile
index 9e757b590..286152995 100644
--- a/doc/ja/makefile
+++ b/doc/ja/makefile
@@ -5,7 +5,59 @@ SUBDIR=doc/ja
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+XSLTPROC=/usr/bin/xsltproc
+STYLESHEET=./style.ja.xsl
+
+
 # Man pages
-SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5
+SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \
+	 sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \
+	 apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \
+	 apt-key.ja.8 apt-secure.ja.8
+
 INCLUDES = apt.ent.ja
-include $(SGML_MANPAGE_H)
+
+doc: $(SOURCE) 
+
+$(SOURCE) ::  % : %.xml $(INCLUDES)
+	echo Creating man page $@
+	$(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+apt-cache.ja.8:: apt-cache.8 
+	cp $< $@
+
+apt-get.ja.8:: apt-get.8
+	cp $< $@
+
+apt-cdrom.ja.8:: apt-cdrom.8 
+	cp $< $@
+
+apt.conf.ja.5:: apt.conf.5 
+	cp $< $@
+
+apt-config.ja.8:: apt-config.8 
+	cp $< $@
+
+sources.list.ja.5:: sources.list.5
+	cp $< $@
+
+apt-sortpkgs.ja.1:: apt-sortpkgs.1
+	cp $< $@
+
+apt-ftparchive.ja.1:: apt-ftparchive.1 
+	cp $< $@
+
+apt_preferences.ja.5:: apt_preferences.5
+	cp $< $@
+
+apt-extracttemplates.ja.1:: apt-extracttemplates.1
+	cp $< $@
+
+apt-key.ja.8:: apt-key.8 
+	cp $< $@
+
+apt-secure.ja.8:: apt-secure.8 
+	cp $< $@
+
+
diff --git a/doc/ja/manpage.links b/doc/ja/manpage.links
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/doc/ja/manpage.links
diff --git a/doc/ja/manpage.refs b/doc/ja/manpage.refs
new file mode 100644
index 000000000..16ffc791b
--- /dev/null
+++ b/doc/ja/manpage.refs
@@ -0,0 +1,4 @@
+{
+  '' => '',
+  '' => ''
+}
diff --git a/doc/ja/sources.list.ja.5.xml b/doc/ja/sources.list.ja.5.xml
new file mode 100644
index 000000000..e000d8767
--- /dev/null
+++ b/doc/ja/sources.list.ja.5.xml
@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+<!ENTITY % aptent SYSTEM "apt.ent.ja">
+%aptent;
+
+]>
+
+<refentry>
+
+ <refentryinfo>
+   &apt-author.jgunthorpe;
+   &apt-author.team;
+   &apt-email;
+   &apt-product;
+   <!-- The last update date -->
+   <date>29 February 2004</date>
+ </refentryinfo>
+ 
+ <refmeta>
+   <refentrytitle>sources.list</refentrytitle>
+   <manvolnum>5</manvolnum>
+ </refmeta>
+ 
+  <!-- Man page title -->
+ <refnamediv>
+    <refname>sources.list</refname>
+<!--
+    <refpurpose>Package resource list for APT</refpurpose>
+-->
+    <refpurpose>APT 用パッケージリソースリスト</refpurpose>
+ </refnamediv>
+ 
+<!--
+ <refsect1><title>Description</title>
+  -->
+ <refsect1><title>説明</title>
+<!--
+   <para>The package resource list is used to locate archives of the package
+   distribution system in use on the system. At this time, this manual page
+   documents only the packaging system used by the Debian GNU/Linux system.
+   This control file is located in <filename>/etc/apt/sources.list</filename></para>
+-->
+   <para>このパッケージリソースリストは、
+   システムで使用するパッケージの保管場所を特定するのに使用されます。
+   今回このマニュアルページには、
+   Debian GNU/Linux システムで使用するパッケージシステムについてのみ記述します。
+   この制御ファイルは、<filename>/etc/apt/sources.list</filename> にあります。</para>
+
+<!--
+   <para>The source list is designed to support any number of active sources and a
+   variety of source media. The file lists one source per line, with the
+   most preferred source listed first. The format of each line is:
+   <literal>type uri args</literal> The first item, <literal>type</literal>
+   determines the format for <literal>args</literal> <literal>uri</literal> is
+   a Universal Resource Identifier 
+   (URI), which is a superset of the more specific and well-known Universal
+   Resource Locator, or URL. The rest of the line can be marked as a comment 
+   by using a #.</para>
+-->
+   <para>ソースリストは複数の有効な取得元と、
+   様々な取得メディアをサポートしています。
+   ファイルには 1 行ごと取得元を列挙し、上の方にあるものから使用します。
+   行のフォーマットは、<literal>タイプ uri 引数</literal> となります。
+   先頭の <literal>タイプ</literal> で、
+   <literal>引数</literal> のフォーマットを決定します。
+   <literal>uri</literal> は Universal Resource Identifier (URI) で、
+   よく知られた URL のスーパーセットです。
+   行の残りに # を付けて、コメントにできます。</para>
+ </refsect1>
+ 
+ <refsect1><title>sources.list.d</title>
+<!--
+   <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
+   a way to add sources.list entries in seperate files that end with 
+   <literal>.list</literal>. The format is the same as for the regular
+   <filename>sources.list</filename> file. </para>
+-->
+   <para><filename>/etc/apt/sources.list.d</filename> ディレクトリに
+   ファイル名が <literal>.list</literal> で終わる個別ファイルを置いておくと、
+   sources.list エントリに追加できます。フォーマットは、
+   通常の <filename>sources.list</filename> ファイルと同じです。</para>
+ </refsect1>
+
+<!--
+ <refsect1><title>The deb and deb-src types</title>
+-->
+ <refsect1><title>deb タイプと deb-src タイプ</title>
+<!--
+   <para>The <literal>deb</literal> type describes a typical two-level Debian
+   archive, <filename>distribution/component</filename>. Typically,
+   <literal>distribution</literal> is generally one of
+   <literal>stable</literal> <literal>unstable</literal> or 
+   <literal>testing</literal> while component is one of <literal>main</literal> 
+   <literal>contrib</literal> <literal>non-free</literal> or
+   <literal>non-us</literal> The 
+   <literal>deb-src</literal> type describes a debian distribution's source
+   code in the same form as the <literal>deb</literal> type.
+   A <literal>deb-src</literal> line is required to fetch source indexes.</para>
+-->
+   <para><literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ 
+   (<filename>distribution/component</filename>) を記述します。
+   よくあるケースでは、<literal>distribution</literal> は通常 
+   <literal>stable</literal> <literal>unstable</literal> 
+   <literal>testing</literal> のどれか、
+   component は、<literal>main</literal> <literal>contrib</literal> 
+   <literal>non-free</literal> <literal>non-us</literal> のどれかです。
+   <literal>deb-src</literal> タイプでは、
+   Debian ディストリビューションのソースコードを、
+   <literal>deb</literal> タイプと同じ形式で記述します。
+   <literal>deb-src</literal> 行は、
+   ソースインデックスを取得するのに必要です。</para>
+
+<!--
+   <para>The format for a <filename>sources.list</filename> entry using the
+   <literal>deb</literal> and <literal>deb-src</literal> types are:</para>
+-->
+   <para><literal>deb</literal> タイプと <literal>deb-src</literal> 
+   タイプで使用する <filename>sources.list</filename> 
+   エントリのフォーマットは、以下になります。</para>
+
+   <literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
+
+<!--
+   <para>The URI for the <literal>deb</literal> type must specify the base of the
+   Debian distribution, from which APT will find the information it needs. 
+   <literal>distribution</literal> can specify an exact path, in which case the 
+   components must be omitted and <literal>distribution</literal> must end with
+   a slash (/). This is useful for when only a particular sub-section of the 
+   archive denoted by the URI is of interest.
+   If <literal>distribution</literal> does not specify an exact path, at least
+   one <literal>component</literal> must be present.</para>
+-->
+   <para><literal>deb</literal> タイプの URI は、
+   APT が情報を見つけられるように、
+   Debian ディストリビューションの基底を指定しなければなりません。
+   <literal>distribution</literal> には正確なパスを指定できます。
+   その場合 component を省略し、<literal>distribution</literal> 
+   はスラッシュ (/) で終わらなくてはなりません。
+   これは URL で指定されたアーカイブの、
+   特定のサブセクションのみに関心があるときに役に立ちます。
+   <literal>distribution</literal> に正確なパスを指定しないのなら、
+   少なくともひとつは <literal>component</literal> を指定しなければなりません。</para>
+
+<!--
+   <para><literal>distribution</literal> may also contain a variable, 
+   <literal>$(ARCH)</literal>
+   which expands to the Debian architecture (i386, m68k, powerpc, ...)
+   used on the system. This permits architecture-independent
+   <filename>sources.list</filename> files to be used. In general this is only
+   of interest when specifying an exact path, <literal>APT</literal> will
+   automatically generate a URI with the current architecture otherwise.</para>
+-->
+   <para><literal>distribution</literal> は、
+   <literal>$(ARCH)</literal> 変数を含む場合があります。
+   <literal>$(ARCH)</literal> 変数は、システムで使用している 
+   Debian アーキテクチャ (i386, m68k, powerpc, ...) に展開されます。
+   これにより、アーキテクチャに依存しない <filename>sources.list</filename> 
+   ファイルを使用できます。
+   一般的に、これは正しいパスを指定するときに気にするだけです。
+   そうでない場合は、<literal>APT</literal> は現在のアーキテクチャで URI 
+   を自動的に生成します。</para>
+
+<!--
+   <para>Since only one distribution can be specified per line it may be necessary
+   to have multiple lines for the same URI, if a subset of all available
+   distributions or components at that location is desired.
+   APT will sort the URI list after it has generated a complete set 
+   internally, and will collapse multiple references to the same Internet 
+   host, for instance, into a single connection, so that it does not 
+   inefficiently establish an FTP connection, close it, do something else, 
+   and then re-establish a connection to that same host. This feature is 
+   useful for accessing busy FTP sites with limits on the number of 
+   simultaneous anonymous users. APT also parallelizes connections to 
+   different hosts to more effectively deal with sites with low bandwidth.</para>
+-->
+   <para>有効な全 distribution, component の場所から、
+   一部が必要な場合、1 行につき 1 distribution しか指定できないため、
+   同じ URI の行を複数記述することになるでしょう。
+   APT は内部で URI リストを生成してから、並べ替えます。
+   そして、同じインターネットホストに対しては複数の参照をまとめます。
+   例えば FTP 接続後、切断してからまた同じホストに再接続するといった、
+   効率の悪いことをせずに、1 接続にまとめます。
+   この機能は、同時接続匿名ユーザ数を制限している、
+   混んでいる FTP サイトにアクセスするのに便利です。
+   APT は、帯域の狭いサイトを効率よく扱うのに、
+   異なるホストへは、接続を並行して行うようにもしています。</para>
+
+<!--
+   <para>It is important to list sources in order of preference, with the most
+   preferred source listed first. Typically this will result in sorting
+   by speed from fastest to slowest (CD-ROM followed by hosts on a local
+   network, followed by distant Internet hosts, for example).</para>
+-->
+   <para>最優先する取得元を最初に記述するというように、
+   優先順に取得元を記述するのは重要です。
+   一般的には、スピードの速い順に並べることになる 
+   (例えば、CD-ROM に続いてローカルネットワークのホスト、
+    さらに続いて彼方のインターネットホスト) でしょう。</para>
+
+<!--
+   <para>Some examples:</para>
+-->
+   <para>例:</para>
+   <literallayout>
+deb http://http.us.debian.org/debian stable main contrib non-free
+deb http://http.us.debian.org/debian dists/stable-updates/
+   </literallayout>
+
+ </refsect1>
+
+<!--
+ <refsect1><title>URI specification</title>
+-->
+ <refsect1><title>URI の仕様</title>
+
+<!--
+   <para>The currently recognized URI types are cdrom, file, http, and ftp.
+-->
+   <para>現在認識する URI 対応は、cdrom, file, http, ftp です。
+   <variablelist>
+    <varlistentry><term>file</term>
+<!--
+    <listitem><para>
+    The file scheme allows an arbitrary directory in the file system to be
+    considered an archive. This is useful for NFS mounts and local mirrors or
+    archives.</para></listitem>
+-->
+    <listitem><para>
+    file スキームは、システム内の任意のディレクトリを、
+    アーカイブとして扱えるようにします。
+    これは NFS マウントやローカルミラーで便利です。</para></listitem>
+    </varlistentry>
+    
+    <varlistentry><term>cdrom</term>
+<!--
+    <listitem><para>
+    The cdrom scheme allows APT to use a local CDROM drive with media
+    swapping. Use the &apt-cdrom; program to create cdrom entries in the
+    source list.</para></listitem>
+-->
+    <listitem><para>
+    cdrom スキームは、APT がローカル CD-ROM ドライブを、
+    メディア交換しながら使えるようにします。
+    取得元リストに cdrom エントリを追加するには、
+    &apt-cdrom; プログラムを使用してください。</para></listitem>
+    </varlistentry>
+
+    <varlistentry><term>http</term>
+<!--
+    <listitem><para>
+    The http scheme specifies an HTTP server for the archive. If an environment
+    variable <envar>http_proxy</envar> is set with the format 
+    http://server:port/, the proxy server specified in
+    <envar>http_proxy</envar> will be used. Users of authenticated
+    HTTP/1.1 proxies may use a string of the format
+    http://user:pass@server:port/
+    Note that this is an insecure method of authentication.</para></listitem>
+-->
+    <listitem><para>
+    http スキームはアーカイブとして、HTTP サーバを指定します。
+    環境変数 <envar>http_proxy</envar> が、
+    http://server:port/ と言った形で指定されていれば、
+    <envar>http_proxy</envar> で指定した プロキシサーバを使用します。
+    ユーザ認証が必要な HTTP/1.1 プロキシの場合、
+    http://user:pass@server:port/ と言う形で指定してください。
+    この認証方法は安全ではないことに注意してください。</para></listitem>
+    </varlistentry>
+
+    <varlistentry><term>ftp</term>
+<!--
+    <listitem><para>
+    The ftp scheme specifies an FTP server for the archive. APT's FTP behavior
+    is highly configurable; for more information see the
+    &apt-conf; manual page. Please note that a ftp proxy can be specified
+    by using the <envar>ftp_proxy</envar> environment variable. It is possible
+    to specify a http proxy (http proxy servers often understand ftp urls)
+    using this method and ONLY this method. ftp proxies using http specified in
+    the configuration file will be ignored.</para></listitem>
+-->
+    <listitem><para>
+    ftp スキームは、アーカイブに FTP サーバを指定します。
+    APT の FTP の振る舞いは、高度に設定できます。
+    詳細は、&apt-conf; のマニュアルページをご覧ください。
+    ftp プロキシは、
+    <envar>ftp_proxy</envar> 環境変数で指定することにご注意ください。
+    この方法用に、さらにこの方法でしか使用しないのに、
+    http プロキシを使用することができます 
+    (http プロキシサーバは大抵 ftp urlも理解できます)。
+    設定ファイルで http を使用する際に、
+    ftp プロキシを使用するよう設定してあっても無視されます。</para></listitem>
+    </varlistentry>
+
+    <varlistentry><term>copy</term>
+<!--
+    <listitem><para>
+    The copy scheme is identical to the file scheme except that packages are
+    copied into the cache directory instead of used directly at their location.
+    This is useful for people using a zip disk to copy files around with APT.</para></listitem>
+-->
+    <listitem><para>
+    copy スキームは、file スキームと同様ですが、パッケージをその場で使用せず、
+    キャッシュディレクトリにコピーするところが違います。
+    zip ディスクを使用していて、APT でコピーを行う場合に便利です。</para></listitem>
+    </varlistentry>
+    
+    <varlistentry><term>rsh</term><term>ssh</term>
+<!--
+    <listitem><para>
+    The rsh/ssh method invokes rsh/ssh to connect to a remote host
+    as a given user and access the files. No password authentication is 
+    possible, prior arrangements with RSA keys or rhosts must have been made.
+    Access to files on the remote uses standard <command>find</command> and
+    <command>dd</command> 
+    commands to perform the file transfers from the remote.</para></listitem>
+-->
+    <listitem><para>
+    rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、
+    ファイルにアクセスするのに rsh/ssh を使用します。
+    あらかじめ RSA キーや rhosts の配置が必要ですが、
+    パスワードなし認証が可能です。
+    リモートホストのファイルへのアクセスの際、
+    ファイル転送に標準の <command>find</command> コマンドや 
+    <command>dd</command> コマンドを使用します。</para></listitem>
+    </varlistentry>
+  </variablelist>
+ </para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>Examples</title>
+-->
+ <refsect1><title>サンプル</title>
+<!--
+   <para>Uses the archive stored locally (or NFS mounted) at /home/jason/debian
+   for stable/main, stable/contrib, and stable/non-free.</para>
+-->
+   <para> /home/jason/debian に格納されている stable/main, stable/contrib, 
+   stable/non-free 用のローカル (または NFS) アーカイブを使用します。</para>
+   <literallayout>deb file:/home/jason/debian stable main contrib non-free</literallayout>
+
+<!--
+   <para>As above, except this uses the unstable (development) distribution.</para>
+-->
+   <para>上記同様ですが、不安定版を使用します。</para>
+   <literallayout>deb file:/home/jason/debian unstable main contrib non-free</literallayout>
+
+<!--
+   <para>Source line for the above</para>
+-->
+   <para>上記のソース行</para>
+   <literallayout>deb-src file:/home/jason/debian unstable main contrib non-free</literallayout>
+
+<!--
+   <para>Uses HTTP to access the archive at archive.debian.org, and uses only
+   the hamm/main area.</para>
+-->
+   <para>archive.debian.org のアーカイブに HTTP アクセスし、
+   hamm/main のみを使用します。</para>
+   <literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
+
+<!--
+   <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+   directory, and uses only the stable/contrib area.</para>
+-->
+   <para>ftp.debian.org のアーカイブに FTP アクセスし、
+   debian ディレクトリ以下の stable/contrib のみを使用します。</para>
+   <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
+
+<!--
+   <para>Uses FTP to access the archive at ftp.debian.org, under the debian
+   directory, and uses only the unstable/contrib area. If this line appears as
+   well as the one in the previous example in <filename>sources.list</filename>.
+   a single FTP session will be used for both resource lines.</para>
+-->
+   <para>ftp.debian.org のアーカイブに FTP アクセスし、
+   debian ディレクトリ以下の unstable/contrib を使用します。
+   <filename>sources.list</filename> に上記サンプルと一緒に指定された場合、
+   両方のリソース行に対応する FTP セッションはひとつだけになります。</para>
+   <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
+
+<!--
+   <para>Uses HTTP to access the archive at nonus.debian.org, under the
+    debian-non-US directory.</para>
+-->
+   <para>nonus.debian.org のアーカイブに HTTP アクセスし、
+   debian-non-US ディレクトリ以下を使用します。</para>
+   <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free</literallayout>
+
+<!--
+   <para>Uses HTTP to access the archive at nonus.debian.org, under the
+   debian-non-US directory, and uses only files found under
+   <filename>unstable/binary-i3866</filename> on i386 machines, 
+   <filename>unstable/binary-m68k</filename> on m68k, and so
+   forth for other supported architectures. [Note this example only 
+   illustrates how to use the substitution variable; non-us is no longer 
+   structured like this] 
+   <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+   </para>
+-->
+   <para>nonus.debian.org のアーカイブに HTTP アクセスし、
+   debian-non-US ディレクトリ以下を使用します。
+   また、i386 マシンでは <filename>unstable/binary-i386</filename> 
+   以下にあるファイル、
+   m68k マシンでは <filename>unstable/binary-m68k</filename> 
+   以下にあるファイル、
+   その他サポートするアーキテクチャごとのファイルのみ使用します。
+   [このサンプルは変数展開の使用法の説明でしかないことに注意してください。
+   non-us はこのような構造になっていません]
+   <literallayout>deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/</literallayout>
+   </para>
+ </refsect1>
+ 
+<!--
+ <refsect1><title>See Also</title>
+-->
+ <refsect1><title>関連項目</title>
+   <para>&apt-cache; &apt-conf;
+   </para>
+ </refsect1>
+
+ &manbugs;
+ &translator;
+ 
+</refentry>
+
diff --git a/doc/ja/style.ja.xsl b/doc/ja/style.ja.xsl
new file mode 100644
index 000000000..4af2d74cf
--- /dev/null
+++ b/doc/ja/style.ja.xsl
@@ -0,0 +1,9 @@
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
+
+<xsl:param name="chunker.output.encoding" select="'EUC-JP'" />
+
+</xsl:stylesheet>
+\ No newline at end of file
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9762005b0..e47418b27 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -204,7 +204,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
    <para>Uses HTTP to access the archive at nonus.debian.org, under the
    debian-non-US directory, and uses only files found under
-   <filename>unstable/binary-i3866</filename> on i386 machines, 
+   <filename>unstable/binary-i386</filename> on i386 machines, 
    <filename>unstable/binary-m68k</filename> on m68k, and so
    forth for other supported architectures. [Note this example only 
    illustrates how to use the substitution variable; non-us is no longer 
diff --git a/methods/connect.cc b/methods/connect.cc
index 4e48927ed..8c2ac6d56 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -103,6 +103,8 @@ static bool DoConnect(struct addrinfo *Addr,string Host,
    if (Err != 0)
    {
       errno = Err;
+      if(errno == ECONNREFUSED)
+         Owner->SetFailExtraMsg("\nFailReason: ConnectionRefused");
       return _error->Errno("connect",_("Could not connect to %s:%s (%s)."),Host.c_str(),
 			   Service,Name);
    }
diff --git a/methods/ftp.cc b/methods/ftp.cc
index f595e0ca4..0c2aa00a7 100644
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm)
 	 UBuf.modtime = FailTime;
 	 utime(FailFile.c_str(),&UBuf);
 	 
-	 // If the file is missing we hard fail otherwise transient fail
-	 if (Missing == true)
+	 // If the file is missing we hard fail and delete the destfile
+	 // otherwise transient fail
+	 if (Missing == true) {
+	    unlink(FailFile.c_str());
 	    return false;
+	 }
 	 Fail(true);
 	 return true;
       }
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 5cb154f66..ba7389cba 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <sys/wait.h>
 #include <iostream>
+#include <sstream>
 
 #define GNUPGPREFIX "[GNUPG:]"
 #define GNUPGBADSIG "[GNUPG:] BADSIG"
@@ -20,7 +21,7 @@
 class GPGVMethod : public pkgAcqMethod
 {
    private:
-   const char *VerifyGetSigners(const char *file, const char *outfile,
+   string VerifyGetSigners(const char *file, const char *outfile,
 				vector<string> &GoodSigners, vector<string> &BadSigners,
 				vector<string> &NoPubKeySigners);
    
@@ -32,11 +33,15 @@ class GPGVMethod : public pkgAcqMethod
    GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {};
 };
 
-const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
+string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
 					 vector<string> &GoodSigners,
 					 vector<string> &BadSigners,
 					 vector<string> &NoPubKeySigners)
 {
+   // setup a (empty) stringstream for formating the return value
+   std::stringstream ret;
+   ret.str("");
+
    if (_config->FindB("Debug::Acquire::gpgv", false))
    {
       std::cerr << "inside VerifyGetSigners" << std::endl;
@@ -54,9 +59,11 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       std::cerr << "Keyring path: " << pubringpath << std::endl;
    }
 
-   if (stat(pubringpath.c_str(), &buff) != 0)
-      return (string("Couldn't access keyring: ") + strerror(errno)).c_str();
-
+   if (stat(pubringpath.c_str(), &buff) != 0) 
+   {
+      ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); 
+      return ret.str();
+   }
    if (pipe(fd) < 0)
    {
       return "Couldn't create pipe";
@@ -65,7 +72,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    pid = fork();
    if (pid < 0)
    {
-      return (string("Couldn't spawn new process") + strerror(errno)).c_str();
+      return string("Couldn't spawn new process") + strerror(errno);
    }
    else if (pid == 0)
    {
@@ -189,7 +196,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    {
       if (GoodSigners.empty())
          return _("Internal error: Good signature, but could not determine key fingerprint?!");
-      return NULL;
+      return "";
    }
    else if (WEXITSTATUS(status) == 1)
    {
@@ -197,9 +204,8 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    }
    else if (WEXITSTATUS(status) == 111)
    {
-      // FIXME String concatenation considered harmful.
-      return (string(_("Could not execute ")) + gpgvpath +
-	      string(_(" to verify signature (is gnupg installed?)"))).c_str();
+      ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str());
+      return ret.str();
    }
    else
    {
@@ -221,8 +227,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
    URIStart(Res);
 
    // Run gpgv on file, extract contents and get the key ID of the signer
-   const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
-				      GoodSigners, BadSigners, NoPubKeySigners);
+   string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(),
+			      GoodSigners, BadSigners, NoPubKeySigners);
    if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty())
    {
       string errmsg;
@@ -247,7 +253,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 dc3f0b763..341de94e3 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -241,28 +241,23 @@ bool CircleBuf::WriteTillEl(string &Data,bool Single)
       if (Buf[I%Size] != '\n')
 	 continue;
       ++I;
-      if (I < InP  && Buf[I%Size] == '\r')
-         ++I;
       
       if (Single == false)
       {
-	 if (Buf[I%Size] != '\n')
-	    continue;
-         ++I;
          if (I < InP  && Buf[I%Size] == '\r')
             ++I;
+         if (I >= InP || Buf[I%Size] != '\n')
+            continue;
+         ++I;
       }
       
-      if (I > InP)
-	 I = InP;
-      
       Data = "";
       while (OutP < I)
       {
 	 unsigned long Sz = LeftWrite();
 	 if (Sz == 0)
 	    return false;
-	 if (I - OutP < LeftWrite())
+	 if (I - OutP < Sz)
 	    Sz = I - OutP;
 	 Data += string((char *)(Buf + (OutP%Size)),Sz);
 	 OutP += Sz;
diff --git a/po/ChangeLog b/po/ChangeLog
index e2e705c12..3ab76d9dc 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,205 @@
+2006-05-29  Peter Mann  <Peter.Mann@tuke.sk>
+
+	* sk.po: Completed to 512t
+
+2006-05-28  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: Completed to 512t
+
+2006-05-17  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: Completed to 512t
+
+2006-05-17  Daniel Nylander  <yeager@lidkoping.net>
+
+	* sv.po: Completed to 512t
+
+2006-05-16  Christian Perrier  <bubulle@debian.org>
+
+	* Update all PO and the POT. Gives 506t6f for formerly
+	  complete translations
+
+2006-04-01  Yavor Doganov  <yavor@doganov.org>
+
+	* bg.po: Added, complete to 512t. Closes: #360262
+
+2006-03-16  eric pareja  <xenos@upm.edu.ph>
+
+	* tl.po: Completed to 512t. Closes: #357215
+
+2006-03-13  Sorin Batariuc  <sorin@bonbon.net>
+
+	* ro.po: Completed to 512t. Closes: #355897
+
+2006-03-12  Miguel Figueiredo  <elmig@debianpt.org>
+
+	* pt.po: Completed to 512t. Closes: #355798
+
+2006-02-14  Carlos Z.F. Liu  <carlosliu@users.sourceforge.net>
+
+	* zh_CN.po: Completed to 512t. Closes: #353936
+
+2006-02-14  Samuele Giovanni Tonon <samu@debian.org>
+
+	* it.po: Completed to 512t. Closes: #352803
+
+2006-02-13  Andre Luis Lopes  <andrelop@debian.org>
+
+	* ca.po: Completed to 512t. Closes: #352419
+
+2006-02-06  Jordi Mallach  <jordi@debian.org>
+
+	* ca.po: Completed to 512t. Closes: #351592
+
+2006-01-30  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: Completed to 512t. Closes: #350483
+
+2006-01-24  Kenshi Muto  <kmuto@debian.org>
+
+	* ja.po: Completed to 512t. Closes: #349806
+
+2006-01-23  Bartosz Fenski aka fEnIo  <fenio@debian.org>
+
+	* pl.po: Completed to 512t. Closes: #349514
+
+2006-01-23  Peter Mann  <Peter.Mann@tuke.sk>
+
+	* sk.po: Completed to 512t. Closes: #349474
+
+2006-01-23  Jacobo Tarrio  <jtarrio@trasno.net>
+
+	* gl.po: Completed to 512 strings 
+	         Closes: #349407
+
+2006-01-22  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: Completed to 512 strings
+
+2006-01-21  Daniel Nylander  <yeager@lidkoping.net>
+
+	* sv.po: Completed to 512 strings
+	         Closes: #349210
+
+2006-01-21  Yuri Kozlov  <kozlov.y@gmail.com>
+
+	* ru.po: Completed to 512 strings
+	         Closes: #349154
+
+2006-01-21  Claus Hindsgaul  <claus_h@image.dk>
+
+	* da.po: Completed to 512 strings
+	         Closes: #349084
+
+2006-01-20  Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: Completed to 512 strings
+	* LINGUAS: Add Welsh
+
+2006-01-20  Christian Perrier  <bubulle@debian.org>
+
+	* *.po: Updated from sources (512 strings)
+
+2006-01-20  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: Completed to 511 strings
+	         Closes: #348968
+
+2006-01-18  Konstantinos Margaritis  <markos@debian.org>
+
+	* el.po: Completed to 511 strings
+	         Closes: #344642
+
+2005-11-07  Claus Hindsgaul  <claus_h@image.dk>
+
+	* da.po: Completed to 511 strings
+	         Closes: #348574
+
+2005-11-16  Andrew Deason  <adeason@tjhsst.edu>
+
+	* en_GB.po: Minor errors correction
+
+2005-11-12  Ruben Porras  <nahoo82@telefonica.net>
+
+	* es.po: Updated to 510t1f
+	         Closes: #348158
+
+2005-11-12  Jacobo Tarrio  <jacobo@tarrio.org>
+
+	* gl.po: Completed to 511 strings
+	         Closes: #347729
+
+2006-01-10 Samuele Giovanni Tonon  <samu@mclink.it>
+
+	* it.po: Yet another update
+	                   Closes: #347435
+
+2006-01-09 Jonas Koelker  <jonaskoelker@users.sourceforge.net>
+
+	* en_GB.po, de.po: fix spaces errors in "Ign " translations
+	                   Closes: #347258
+
+2006-01-09  Thomas Huriaux  <thomas.huriaux@gmail.com>
+
+	* makefile: make update-po a pre-requisite of clean target so
+	            that POT and PO files are always up-to-date
+
+2006-01-08  Daniel Nylander  <yeager@lidkoping.net>
+
+	* sv.po: Completed to 511t. Closes: #346450
+
+2006-01-06  Peter Mann  <Peter.Mann@tuke.sk>
+
+	* sk.po: Completed to 511t. Closes: #346369
+
+2006-01-06  Christian Perrier  <bubulle@debian.org>
+
+	* *.po: Updated from sources (511 strings)
+	* fr.po: Completed to 511t
+
+2006-01-01  Samuele Giovanni Tonon  <samu@mclink.it>
+
+	* it.po: Completed to 510t
+
+2006-01-01  Neil Williams  <linux@codehelp.co.uk>
+
+	* en_GB.po: Completed to 510t
+
+2005-12-30  Miroslav Kure  <kurem@upcase.inf.upol.cz>
+
+	* cs.po: Completed to 510t
+
+2005-12-25  Ming Hua  <minghua@rice.edu>
+
+	* zh_CN.po: Completed to 510t
+
+2005-12-25  Konstantinos Margaritis  <markos@debian.org>
+
+	* el.po: Updated to 510t
+
+2005-12-19  Clytie Siddall  <clytie@riverland.net.au>
+
+	* vi.po: Updated to 383t93f34u
+
+2005-12-19  eric pareja  <xenos@upm.edu.ph>
+
+	* tl.po: Completed to 510 strings
+	         Closes: #344306
+
+2005-12-19  Daniel Nylander  <yeager@lidkoping.net>
+
+	* sv.po: Completed to 510 strings
+	         Closes: #344056
+
+2005-11-29   Christian Perrier  <bubulle@debian.org>
+
+	* LINGUAS: disabled Hebrew translation. Closes: #313283
+
+2005-12-05  Piarres Beobide  <pi@beobide.net>
+
+	* eu.po: Completed to 510 strings
+	         Closes: #342091
+
 2005-11-29   Christian Perrier  <bubulle@debian.org>
 
 	* fr.po: Completed to 510 strings
diff --git a/po/LINGUAS b/po/LINGUAS
index ba7f30eb8..aec84e943 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-bs ca cs da de el en_GB es eu fi fr he hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl zh_CN zh_TW
+bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 311549b4f..6929345af 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,14 +146,14 @@ msgstr ""
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -417,7 +417,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
@@ -531,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc: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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -753,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: 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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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"
@@ -828,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -908,158 +908,163 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1360,7 +1365,7 @@ msgstr ""
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr ""
 
@@ -1404,10 +1409,6 @@ msgstr ""
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1478,12 +1479,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1609,7 +1610,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1632,7 +1633,7 @@ msgstr ""
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr ""
 
@@ -1661,69 +1662,70 @@ msgstr ""
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr ""
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1739,76 +1741,76 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr ""
 
@@ -2087,24 +2089,24 @@ msgstr ""
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
 msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
 msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
 msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
@@ -2198,9 +2200,16 @@ msgstr ""
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
 msgstr ""
 
 #: apt-pkg/acquire-worker.cc:113
@@ -2341,31 +2350,35 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr ""
 
@@ -2506,12 +2519,12 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
+msgid "Preparing to completely remove %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
+msgid "Completely removed %s"
 msgstr ""
 
 #: methods/rsh.cc:330
diff --git a/po/bg.po b/po/bg.po
new file mode 100644
index 000000000..e515d6c5b
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,2792 @@
+# Bulgarian translation of apt.
+# Copyright (C) 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the apt package.
+# Yavor Doganov <yavor@doganov.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apt 0.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-03-31 22:05+0300\n"
+"Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Пакет %s версия %s има неудовлетворена зависимост:\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Пакетът %s не може да бъде намерен"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "Общо имена на пакети : "
+
+#: cmdline/apt-cache.cc:272
+msgid "  Normal packages: "
+msgstr "  Нормални пакети: "
+
+#: cmdline/apt-cache.cc:273
+msgid "  Pure virtual packages: "
+msgstr "  Чисти виртуални пакети: "
+
+#: cmdline/apt-cache.cc:274
+msgid "  Single virtual packages: "
+msgstr "  Единични виртуални пакети: "
+
+#: cmdline/apt-cache.cc:275
+msgid "  Mixed virtual packages: "
+msgstr "  Смесени виртуални пакети: "
+
+#: cmdline/apt-cache.cc:276
+msgid "  Missing: "
+msgstr "  Липсващи: "
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "Общо уникални версии: "
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "Общо зависимости: "
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "Общо отношения версия/файл: "
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "Общо отношения „Осигурява“: "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "Общо разгърнати низове: "
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "Общо пространство за зависимости по версии: "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "Общо празно пространство: "
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "Общо отчетено пространство: "
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "Пакетният файл %s не е синхронизиран."
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "Трябва да въведете само един израз"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "Няма намерени пакети"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "Пакетни файлове:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл"
+
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "Отбити пакети:"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(не са намерени)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid "  Installed: "
+msgstr "  Инсталирана: "
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(няма)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid "  Candidate: "
+msgstr "  Кандидат: "
+
+#: cmdline/apt-cache.cc:1532
+msgid "  Package pin: "
+msgstr "  Отбиване на пакета: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid "  Version table:"
+msgstr "  Таблица с версиите:"
+
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid "       %4i %s\n"
+msgstr "       %4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s за %s %s, компилиран на %s %s\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
+"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+"   add - Add a package file to the source cache\n"
+"   gencaches - Build both the package and source cache\n"
+"   showpkg - Show some general information for a single package\n"
+"   showsrc - Show source records\n"
+"   stats - Show some basic statistics\n"
+"   dump - Show the entire file in a terse form\n"
+"   dumpavail - Print an available file to stdout\n"
+"   unmet - Show unmet dependencies\n"
+"   search - Search the package list for a regex pattern\n"
+"   show - Show a readable record for the package\n"
+"   depends - Show raw dependency information for a package\n"
+"   rdepends - Show reverse dependency information for a package\n"
+"   pkgnames - List the names of all packages\n"
+"   dotty - Generate package graphs for GraphVis\n"
+"   xvcg - Generate package graphs for xvcg\n"
+"   policy - Show policy settings\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -p=? The package cache.\n"
+"  -s=? The source cache.\n"
+"  -q   Disable progress indicator.\n"
+"  -i   Show only important deps for the unmet command.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Употреба: apt-cache [опции] команда\n"
+"          apt-cache [опции] add файл1 [файл2 ...]\n"
+"          apt-cache [опции] showpkg пакет1 [пакет2 ...]\n"
+"          apt-cache [опции] showsrc пакет1 [пакет2 ...]\n"
+"\n"
+"apt-cache е инструмент на ниско ниво за обработка на двоичните\n"
+"кеш файлове на APT и извличане на информация от тях\n"
+"\n"
+"Команди:\n"
+"   add - Добавя пакетен файл към кеша на пакети с изходен код\n"
+"   gencaches - Генериране на кеша на пакети и пакети с изходен код\n"
+"   showpkg - Показва обща информация за даден пакет\n"
+"   showsrc - Показва записите на пакета с изходен код\n"
+"   stats - Показва някои общи статистики\n"
+"   dump - Показва целия файл в сбита форма\n"
+"   dumpavail - Разпечатва наличен файл в stdout\n"
+"   unmet - Показва неудовлетворени зависимости\n"
+"   search - Търси в списъка с пакети за регулярен израз\n"
+"   show - Показва запис за пакета\n"
+"   depends - Показва необработена информация за зависимости на пакета\n"
+"   rdepends - Показва информация за обратните зависимости на пакета\n"
+"   pkgnames - Списък с имената на всички пакети\n"
+"   dotty - Генериране на графики на пакети за GraphVis\n"
+"   xvcg - Генериране на графики на пакети за xvcg\n"
+"   policy - Показване на настройките на политиката\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -p=? Кешът за пакети.\n"
+"  -s=? Кешът за пакети с изходен код.\n"
+"  -q   Премахване на индикатора за напредък.\n"
+"  -i   Показване само на важни зависимости при командата „unmet“.\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+"Вижте „man“ страниците apt-cache(8) и apt.conf(5) за повече информация.\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Задайте име за този диск, като „Debian 2.1r1 Disk1“"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Сложете диск в устройството и натиснете „Enter“"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Повторете този процес за останалите дискове от комплекта."
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Аргументите не са по двойки"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+"   shell - Shell mode\n"
+"   dump - Show the configuration\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-config [опции] команда\n"
+"\n"
+"apt-config е опростен инструмент за четене на конфигурационния файл на APT\n"
+"\n"
+"Команди:\n"
+"   shell - Режим с обвивка\n"
+"   dump - Показва конфигурацията\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s не е валиден DEB пакет."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-extracttemplates файл1 [файл2 ...]\n"
+"\n"
+"apt-extracttemplates е инструмент за извличане на конфигурационна "
+"информация\n"
+"и шаблони от дебиански пакети\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -t   Настройване на временна директория\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Неуспех при записа на %s"
+
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?"
+
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "Списъкът с разширения на пакети и твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Грешка при обработката на директория %s"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "Списъкът с разширения на източници е твърде дълъг"
+
+#: ftparchive/apt-ftparchive.cc:371
+msgid "Error writing header to contents file"
+msgstr "Грешка при запазването на заглавната част във файла със съдържание"
+
+#: ftparchive/apt-ftparchive.cc:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Грешка при обработката на съдържание %s"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Употреба: apt-ftparchive [опции] команда\n"
+"Команди:  packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents път\n"
+"          release път\n"
+"          generate config [групи]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive генерира индексни файлове за архиви на Debian. Поддържа\n"
+"много стилове на генериране от напълно автоматично до функционални\n"
+"замени на dpkg-scanpackages и dpkg-scansources.\n"
+"\n"
+"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n"
+"„Package“ представлява съдържанието на всички контролни полета на всеки\n"
+"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n"
+"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n"
+"\n"
+"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n"
+"файлове. Опцията --source-override може да се използва за указване на файл\n"
+"„override“ за пакети с изходен код.\n"
+"\n"
+"Командите „packages“ и „sources“ трябва да се изпълняват в корена на "
+"дървото.\n"
+"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене "
+"и\n"
+"файла „override“ трябва да съдържа всички флагове за преназначаване. "
+"Pathprefix\n"
+"се прибавя към полетата на файловите имена, ако съществува. Пример за "
+"употреба\n"
+"от архива на Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Опции:\n"
+"  -h    Този помощен текст.\n"
+"  --md5 Управление на генерирането на MD5.\n"
+"  -s=?  Файл „override“ за пакети с изходен код.\n"
+"  -q    Без показване на съобщения.\n"
+"  -d=?  Избор на допълнителна база от данни за кеширане.\n"
+"  --no-delink Включване на режим за премахване на връзки.\n"
+"  --contents  Управление на генерирането на файлове със съдържание.\n"
+"  -c=?  Четене на този конфигурационен файл.\n"
+"  -o=?  Настройване на произволна конфигурационна опция"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "Няма съвпадения на избора"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Липсват някои файлове от групата с файлови пакети „%s“"
+
+#: ftparchive/cachedb.cc:45
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "БД е повредена, файлът е преименуван на %s.old"
+
+#: ftparchive/cachedb.cc:63
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "БД е стара, опит за актуализиране на %s"
+
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Неуспех при отварянето на файл %s от БД: %s"
+
+#: ftparchive/cachedb.cc:114
+#, c-format
+msgid "File date has changed %s"
+msgstr "Датата на файла %s е променена"
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "В архива няма поле „control“"
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "Неуспех при получаването на курсор"
+
+#: ftparchive/writer.cc:78
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "W: Неуспех при четенето на директория %s\n"
+
+#: ftparchive/writer.cc:83
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "W: Неуспех при четенето на %s\n"
+
+#: ftparchive/writer.cc:125
+msgid "E: "
+msgstr "E: "
+
+#: ftparchive/writer.cc:127
+msgid "W: "
+msgstr "W: "
+
+#: ftparchive/writer.cc:134
+msgid "E: Errors apply to file "
+msgstr "E: Грешките се отнасят за файла "
+
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Неуспех при превръщането на %s"
+
+#: ftparchive/writer.cc:163
+msgid "Tree walking failed"
+msgstr "Неуспех при обхода на дървото"
+
+#: ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to open %s"
+msgstr "Неуспех при отварянето на %s"
+
+#: ftparchive/writer.cc:245
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
+
+#: ftparchive/writer.cc:253
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Неуспех при прочитането на връзка %s"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Неуспех при премахването на връзка %s"
+
+#: ftparchive/writer.cc:264
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Неуспех при създаването на връзка %s към %s"
+
+#: ftparchive/writer.cc:274
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "Превишен лимит на DeLink от %sB.\n"
+
+#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Грешка при получаването на атрибути за %s"
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "Архивът няма поле „package“"
+
+#: 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:689
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  поддържащия пакета %s е %s, а не %s\n"
+
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Неуспех при заделянето на памет"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "Неуспех при отварянето на %s"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Неправилно форматиран override %s, ред %lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Неправилно форматиран override %s, ред %lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Неправилно форматиран override %s, ред %lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Неуспех при четенето на override файл %s"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Непознат алгоритъм за компресия „%s“"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Компресираният изход %s изисква настройка за компресирането"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Неуспех при създаването на IPC pipe към подпроцеса"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "Неуспех при създаването на FILE*"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "Неуспех при пускането на подпроцес"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "Процес-потомък за компресиране"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Вътрешна грешка, неуспех при създаването на %s"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "Неуспех при създаването на подпроцес IPC"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "Неуспех при изпълнението на компресиращата програма "
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "декомпресираща програма"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "В/И към подпроцеса/файла пропадна"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "Неуспех при четене докато се изчислява MD5"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Неуспех при премахването на връзка на %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Неуспех при преименуването на %s на %s"
+
+#: cmdline/apt-get.cc:120
+msgid "Y"
+msgstr "Y"
+
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Грешка при компилирането на регулярния израз - %s"
+
+#: cmdline/apt-get.cc:237
+msgid "The following packages have unmet dependencies:"
+msgstr "Следните пакети имат неудовлетворени зависимости:"
+
+#: cmdline/apt-get.cc:327
+#, c-format
+msgid "but %s is installed"
+msgstr "но е инсталиран %s"
+
+#: cmdline/apt-get.cc:329
+#, c-format
+msgid "but %s is to be installed"
+msgstr "но ще бъде инсталиран %s"
+
+#: cmdline/apt-get.cc:336
+msgid "but it is not installable"
+msgstr "но той не може да бъде инсталиран"
+
+#: cmdline/apt-get.cc:338
+msgid "but it is a virtual package"
+msgstr "но той е виртуален пакет"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not installed"
+msgstr "но той не е инсталиран"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not going to be installed"
+msgstr "но той няма да бъде инсталиран"
+
+#: cmdline/apt-get.cc:346
+msgid " or"
+msgstr " или"
+
+#: cmdline/apt-get.cc:375
+msgid "The following NEW packages will be installed:"
+msgstr "Следните НОВИ пакети ще бъдат инсталирани:"
+
+#: cmdline/apt-get.cc:401
+msgid "The following packages will be REMOVED:"
+msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:"
+
+#: cmdline/apt-get.cc:423
+msgid "The following packages have been kept back:"
+msgstr "Следните пакети няма да бъдат променени:"
+
+#: cmdline/apt-get.cc:444
+msgid "The following packages will be upgraded:"
+msgstr "Следните пакети ще бъдат актуализирани:"
+
+#: cmdline/apt-get.cc:465
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:"
+
+#: cmdline/apt-get.cc:485
+msgid "The following held packages will be changed:"
+msgstr "Следните задържани пакети ще бъдат променени:"
+
+#: cmdline/apt-get.cc:538
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (поради %s) "
+
+#: cmdline/apt-get.cc:546
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n"
+"Това НЕ би трябвало да става освен ако знаете точно какво правите!"
+
+#: cmdline/apt-get.cc:577
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu актуализирани, %lu нови инсталирани, "
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu преинсталирани, "
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu върнати към по-стара версия, "
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu за премахване и %lu без промяна.\n"
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu не са напълно инсталирани или премахнати.\n"
+
+#: cmdline/apt-get.cc:649
+msgid "Correcting dependencies..."
+msgstr "Коригиране на зависимостите..."
+
+#: cmdline/apt-get.cc:652
+msgid " failed."
+msgstr " пропадна."
+
+#: cmdline/apt-get.cc:655
+msgid "Unable to correct dependencies"
+msgstr "Неуспех при коригирането на зависимостите"
+
+#: cmdline/apt-get.cc:658
+msgid "Unable to minimize the upgrade set"
+msgstr "Неуспех при минимизирането на набора актуализации"
+
+#: cmdline/apt-get.cc:660
+msgid " Done"
+msgstr " Готово"
+
+#: cmdline/apt-get.cc:664
+msgid "You might want to run `apt-get -f install' to correct these."
+msgstr ""
+"Възможно е да изпълните „apt-get -f install“, за да коригирате тези "
+"неизправности."
+
+#: cmdline/apt-get.cc:667
+msgid "Unmet dependencies. Try using -f."
+msgstr "Неудовлетворени зависимости. Опитайте с „-f“."
+
+#: cmdline/apt-get.cc:689
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!"
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr "Предупреждението за удостоверяването е пренебрегнато.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr "Инсталиране на тези пакети без проверка [y/N]?"
+
+#: cmdline/apt-get.cc:702
+msgid "Some packages could not be authenticated"
+msgstr "Някои пакети не можаха да бъдат удостоверени"
+
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!"
+
+#: cmdline/apt-get.cc:764
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено."
+
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr "Вътрешна грешка, „Ordering“ не завърши"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+msgid "Unable to lock the download directory"
+msgstr "Неуспех при заключването на директорията за изтегляне"
+
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
+#: apt-pkg/cachefile.cc:67
+msgid "The list of sources could not be read."
+msgstr "Списъкът с източници не можа да бъде прочетен."
+
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org"
+
+#: cmdline/apt-get.cc:821
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n"
+
+#: cmdline/apt-get.cc:824
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Необходимо е да се изтеглят %sB архиви.\n"
+
+#: cmdline/apt-get.cc:829
+#, c-format
+msgid "After unpacking %sB of additional disk space will be used.\n"
+msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n"
+
+#: cmdline/apt-get.cc:832
+#, c-format
+msgid "After unpacking %sB disk space will be freed.\n"
+msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n"
+
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Неуспех при определянето на свободното пространство в %s"
+
+#: cmdline/apt-get.cc:849
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Нямате достатъчно свободно пространство в %s."
+
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
+
+#: cmdline/apt-get.cc:866
+msgid "Yes, do as I say!"
+msgstr "Да, прави каквото казвам!"
+
+#: cmdline/apt-get.cc:868
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"На път сте да направите нещо потенциално опасно.\n"
+"За да продължите, въведете фразата „%s“\n"
+" ?] "
+
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+msgid "Abort."
+msgstr "Прекъсване."
+
+#: cmdline/apt-get.cc:889
+msgid "Do you want to continue [Y/n]? "
+msgstr "Искате ли да продължите [Y/n]? "
+
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Неуспех при изтеглянето на %s  %s\n"
+
+#: cmdline/apt-get.cc:979
+msgid "Some files failed to download"
+msgstr "Някои файлове не можаха да бъдат изтеглени"
+
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+msgid "Download complete and in download only mode"
+msgstr "Изтеглянето завърши в режим само на изтегляне"
+
+#: cmdline/apt-get.cc:986
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
+"или да опитате с „--fix-missing“?"
+
+#: cmdline/apt-get.cc:990
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
+
+#: cmdline/apt-get.cc:995
+msgid "Unable to correct missing packages."
+msgstr "Неуспех при коригирането на липсващите пакети."
+
+#: cmdline/apt-get.cc:996
+msgid "Aborting install."
+msgstr "Прекъсване на инсталирането."
+
+#: cmdline/apt-get.cc:1030
+#, c-format
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Забележете, избиране на %s вместо %s\n"
+
+#: cmdline/apt-get.cc:1040
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
+
+#: cmdline/apt-get.cc:1058
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
+
+#: cmdline/apt-get.cc:1069
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
+
+#: cmdline/apt-get.cc:1081
+msgid " [Installed]"
+msgstr " [Инсталиран]"
+
+#: cmdline/apt-get.cc:1086
+msgid "You should explicitly select one to install."
+msgstr "Трябва изрично да изберете един за инсталиране."
+
+#: cmdline/apt-get.cc:1091
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Пакетът %s не е наличен, но е в списъка със зависимости на друг пакет.\n"
+"Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
+"само от друг източник\n"
+
+#: cmdline/apt-get.cc:1110
+msgid "However the following packages replace it:"
+msgstr "Обаче следните пакети го заместват:"
+
+#: cmdline/apt-get.cc:1113
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "Пакетът %s няма кандидат за инсталиране"
+
+#: cmdline/apt-get.cc:1133
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
+
+#: cmdline/apt-get.cc:1141
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s вече е най-новата версия.\n"
+
+#: cmdline/apt-get.cc:1168
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Не е намерено издание „%s“ на „%s“"
+
+#: cmdline/apt-get.cc:1170
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Не е намерена версия „%s“ на „%s“"
+
+#: cmdline/apt-get.cc:1176
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Избрана е версия %s (%s) за %s\n"
+
+#: cmdline/apt-get.cc:1313
+msgid "The update command takes no arguments"
+msgstr "Командата „update“ не възприема аргументи"
+
+#: cmdline/apt-get.cc:1326
+msgid "Unable to lock the list directory"
+msgstr "Неуспех при заключването на директорията със списъка на пакетите"
+
+#: cmdline/apt-get.cc:1384
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или "
+"са използвани по-стари."
+
+#: cmdline/apt-get.cc:1403
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
+
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Неуспех при намирането на пакет %s"
+
+#: cmdline/apt-get.cc:1516
+#, c-format
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
+
+#: cmdline/apt-get.cc:1546
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
+
+#: cmdline/apt-get.cc:1549
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
+"укажете разрешение)."
+
+#: cmdline/apt-get.cc:1561
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Някои пакети не можаха да бъдат инсталирани. Това може да означава,\n"
+"че сте изискали невъзможна ситуация или ако използвате нестабилната\n"
+"дистрибуция, че някои необходими пакети още не са създадени или пък\n"
+"са били преместени от Incoming."
+
+#: cmdline/apt-get.cc:1569
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"Тъй като сте указали единична операция, твърде е възможно пакета просто\n"
+"да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n"
+"доклад за грешка за този пакет."
+
+#: cmdline/apt-get.cc:1574
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+"Следната информация може да помогне за намиране на изход от ситуацията:"
+
+#: cmdline/apt-get.cc:1577
+msgid "Broken packages"
+msgstr "Счупени пакети"
+
+#: cmdline/apt-get.cc:1603
+msgid "The following extra packages will be installed:"
+msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
+
+#: cmdline/apt-get.cc:1674
+msgid "Suggested packages:"
+msgstr "Предложени пакети:"
+
+#: cmdline/apt-get.cc:1675
+msgid "Recommended packages:"
+msgstr "Препоръчвани пакети:"
+
+#: cmdline/apt-get.cc:1695
+msgid "Calculating upgrade... "
+msgstr "Изчисляване на актуализацията..."
+
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "Неуспех"
+
+#: cmdline/apt-get.cc:1703
+msgid "Done"
+msgstr "Готово"
+
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
+
+#: cmdline/apt-get.cc:1876
+msgid "Must specify at least one package to fetch source for"
+msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
+
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Неуспех при намирането на изходен код на пакет %s"
+
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Пропускане на вече изтегления файл „%s“\n"
+
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Нямате достатъчно свободно пространство в %s"
+
+#: cmdline/apt-get.cc:1979
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
+
+#: cmdline/apt-get.cc:1982
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
+
+#: cmdline/apt-get.cc:1988
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Изтегляне на изходен код %s\n"
+
+#: cmdline/apt-get.cc:2019
+msgid "Failed to fetch some archives."
+msgstr "Неуспех при изтеглянето на някои архиви."
+
+#: cmdline/apt-get.cc:2047
+#, c-format
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr ""
+"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
+
+#: cmdline/apt-get.cc:2059
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Командата за разпакетиране „%s“ пропадна.\n"
+
+#: cmdline/apt-get.cc:2060
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
+
+#: cmdline/apt-get.cc:2077
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Командата за компилиране „%s“ пропадна.\n"
+
+#: cmdline/apt-get.cc:2096
+msgid "Child process failed"
+msgstr "Процесът-потомък пропадна"
+
+#: cmdline/apt-get.cc:2112
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
+
+#: cmdline/apt-get.cc:2140
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr ""
+"Неуспех при получаването на информация за зависимостите за компилиране на %s"
+
+#: cmdline/apt-get.cc:2160
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "%s няма зависимости за компилиране.\n"
+
+#: cmdline/apt-get.cc:2212
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
+"не може да бъде намерен"
+
+#: cmdline/apt-get.cc:2264
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже няма "
+"налични версии на пакета %s, които могат да удовлетворят изискването за "
+"версия"
+
+#: cmdline/apt-get.cc:2299
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
+"пакет %s е твърде нов"
+
+#: cmdline/apt-get.cc:2324
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
+
+#: cmdline/apt-get.cc:2338
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
+
+#: cmdline/apt-get.cc:2342
+msgid "Failed to process build dependencies"
+msgstr "Неуспех при обработката на зависимостите за компилиране"
+
+#: cmdline/apt-get.cc:2374
+msgid "Supported modules:"
+msgstr "Поддържани модули:"
+
+#: cmdline/apt-get.cc:2415
+msgid ""
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+"   update - Retrieve new lists of packages\n"
+"   upgrade - Perform an upgrade\n"
+"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+"   remove - Remove packages\n"
+"   source - Download source archives\n"
+"   build-dep - Configure build-dependencies for source packages\n"
+"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+"   dselect-upgrade - Follow dselect selections\n"
+"   clean - Erase downloaded archive files\n"
+"   autoclean - Erase old downloaded archive files\n"
+"   check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -d  Download only - do NOT install or unpack archives\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Attempt to continue if the integrity check fails\n"
+"  -m  Attempt to continue if archives are unlocatable\n"
+"  -u  Show a list of upgraded packages as well\n"
+"  -b  Build the source package after fetching it\n"
+"  -V  Show verbose version numbers\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+"Употреба: apt-get [опции] команда\n"
+"          apt-get [опции] install|remove пакет1 [пакет2 ...]\n"
+"          apt-get [опции] source пакет1 [пакет2 ...]\n"
+"\n"
+"apt-get е опростен интерфейс за командния ред за изтегляне и\n"
+"инсталиране на пакети. Най-често използваните команди са „update“\n"
+"и „install“.\n"
+"\n"
+"Команди:\n"
+"   update - Зареждане на нови списъци с пакети\n"
+"   upgrade - Извършване на актуализиране\n"
+"   install - Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)\n"
+"   remove - Премахване на пакети\n"
+"   source - Изтегляне на изходен код на пакети\n"
+"   build-dep - Конфигуриране на зависимостите за компилиране за изходен код "
+"на пакети\n"
+"   dist-upgrade - Актуализиране на дистрибуцията, вижте apt-get(8)\n"
+"   dselect-upgrade - Следване на избора на dselect\n"
+"   clean - Изтриване на изтеглените файлове\n"
+"   autoclean - Изтриване на стари изтеглени файлове\n"
+"   check - Проверка за счупени зависимости\n"
+"\n"
+"Опции:\n"
+"  -h  Този помощен текст.\n"
+"  -q  Изход на съобщения, подходящи за журнал - без индикатор на напредъка\n"
+"  -qq Без изход на съобщения освен при грешки\n"
+"  -d  Само изтегляне - да НЕ се инсталират или разпакетират архивите\n"
+"  -s  Без действие. Предизвикване на симулация.\n"
+"  -y  Отговаряне с „Да“ на всички въпроси, без питане\n"
+"  -f  Опит за продължаване дори и при неуспех на проверката за цялост\n"
+"  -m  Опит за продължаване дори и ако архивите са неоткриваеми\n"
+"  -u  Показване на списък с пакетите са актуализиране\n"
+"  -b  Компилиране на изходния код на пакета след изтеглянето му\n"
+"  -V  Показване на подробни версии\n"
+"  -c=? Четене на този конфигурационен файл\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+"Вижте страниците на apt-get(8), sources.list(5) и apt.conf(5) за повече\n"
+"информация и опции.\n"
+"                           Това APT има Върховни Сили.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Поп "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Изт:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Игн "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Грш "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Изтеглени %sB за %s (%sB/сек)\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [В процес на работа]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Смяна на носител: сложете диска с етикет\n"
+" „%s“\n"
+"в устройството „%s“ и натиснете „Enter“\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Непознат запис за пакет!"
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n"
+"\n"
+"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n"
+"„-s“ се използва, за да покаже типа на файла.\n"
+"\n"
+"Опции:\n"
+"  -h   Този помощен текст.\n"
+"  -s   Използване на сортиране по изходен код.\n"
+"  -c=? Четене на този конфигурационен файл.\n"
+"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
+"tmp\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Лоша стандартна настройка!"
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Натиснете „Enter“, за да продължите."
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Възникнаха някои грешки при разпакетирането. Ще се конфигурират"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "инсталираните пакети. Това може да доведе до дублирани грешки или"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "грешки, причинени от липсващи зависимости. Това е наред, само грешките"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"над това съобщение за важни. Коригирайте ги и изпълнете [I]nstall наново"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Смесване на наличната информация"
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Неуспех при създаването на програмни канали"
+
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "
+msgstr "Неуспех при изпълнението на gzip"
+
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+msgid "Corrupted archive"
+msgstr "Развален архив"
+
+#: apt-inst/contrib/extracttar.cc:195
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Невярна контролна сума на tar, развален архив"
+
+#: apt-inst/contrib/extracttar.cc:298
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Непозната заглавна част на TAR тип %u, елемент %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "Невалиден подпис на архива"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "Грешка при четене на заглавната част на елемента на архива"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "Невалидна заглавна част на елемента на архива"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "Архивът е твърде кратък"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "Неуспех при четенето на заглавните части на архива"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "Извикан е DropNode за все още използван възел"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "Грешка при намирането на хеш-елемента!"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "Неуспех при установяване на отклонението"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "Вътрешна грешка в AddDiversion"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Двойно добавяне на отклонение %s -> %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Дублиран конфигурационен файл %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Неуспех при запис на файл %s"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Неуспех при затварянето на файл %s"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "Пътят %s е твърде дълъг"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Разпакетиране на %s повече от веднъж"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Директорията %s е отклонена"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "Пътят за отклонение е твърде дълъг"
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Директорията %s се заменя с не-директория"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Неуспех при намирането на възел в неговия хеш"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "Пътят е твърде дълъг"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Файловете се заменят със съдържанието на пакета %s без версия"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Файл %s/%s заменя този в пакет %s"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "Неуспех при четенето на %s"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Неуспех при получаването на атрибути за %s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Неуспех при премахването на %s"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Неуспех при създаването на %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Неуспех при получаването на атрибути %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Директориите info и temp трябва да бъдат на една и съща файлова система"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
+msgstr "Четене на списъците с пакети"
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Неуспех при преминаването в администраторската директория %sinfo"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "Вътрешна грешка при получаването на името на пакета"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "Четене на списъка на файловете"
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Неуспех при отварянето на списъка с файлове „%sinfo/%s“. Ако не може да "
+"възстановите този файл, запишете го като празен и веднага преинсталирайте "
+"същата версия на пакета!"
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "Вътрешна грешка при получаването на възел"
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Неуспех при отварянето на файл с отклонения %sdiversions"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Файлът с отклонения е повреден"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Неправилен ред във файла с отклонения: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "Вътрешна грешка при добавянето на отклонение"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "Първо трябва да се инициализира кеша с пакети"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Грешка при анализирането на MD5. Изместване %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Това не е валиден DEB архив, липсва елемент „%s“"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "Това не е валиден DEB архив, няма елемент „%s“ или „%s“"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Неуспех при преминаването в %s"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "Вътрешна грешка, не може да се открие елемент"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "Неуспех при намирането на валиден контролен файл"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "Контролен файл, невъзможен за анализ"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Неуспех при четенето на базата %s със CD-ROM"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Използвайте „apt-cdrom“, за да може този CD-ROM да се разпознава от APT. "
+"„apt-get update“ не може да се използва за добавяне на нови дискове"
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "Грешен CD-ROM"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва."
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "Дискът не е намерен."
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Файлът не е намерен"
+
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "Неуспех при получаването на атрибути"
+
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "Неуспех при задаването на време на промяна"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Влизане"
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "Неуспех при установяването на името на отдалечения сървър"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "Неуспех при установяването на локалното име"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Сървърът отказа свързване и съобщи: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "USER се провали, сървърът съобщи: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "PASS се провали, сървърът съобщи: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::"
+"ProxyLogin е празен."
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "TYPE се провали, сървърът съобщи: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Допустимото време за свързването изтече"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "Сървърът разпадна връзката"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Грешка при четене"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Отговорът препълни буфера."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Развален протокол"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Грешка при запис"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "Неуспех при създаването на гнездо"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr ""
+"Неуспех при свързването на гнездо за данни, допустимото време за свъзрзване "
+"изтече"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "Неуспех при свързването на пасивно гнездо."
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo не успя да се добере до слушащо гнездо"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "Неуспех при свързването на гнездо"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "Неуспех при слушането на гнездото"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Неуспех при определянето на името на гнездото"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "Неуспех при изпращането на командата PORT"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Неизвестно семейство адреси %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "EPRT се провали, сървърът съобщи: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Времето за установяване на връзка с гнездо за данни изтече"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Невъзможно е да се приеме свързването"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Проблем при хеширане на файла"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Времето за връзка с гнездо за данни изтече"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Запитване"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "Неуспех при извикването на "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Свързване с %s (%s)"
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Не може да се започне свързване с %s:%s (%s)."
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Неуспех при свързване с %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Свързване с %s"
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Неуспех при намирането на IP адреса на „%s“"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Временен неуспех при намирането на IP адреса на „%s“"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Неуспех при свързването с %s %s:"
+
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Неуспех при намирането на IP адреса на „%s“"
+
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+"E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване "
+"на работа."
+
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на "
+"ключа?!"
+
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
+msgstr "Намерен е поне един невалиден подпис."
+
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " за проверка на подписа (инсталиран ли е gnupg?)"
+
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
+msgstr "Неизвестна грешка при изпълнението на gpgv"
+
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
+msgstr "Следните подписи са невалидни:\n"
+
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Следните подписи не можаха да бъдат проверени, защото публичния ключ не е "
+"наличен:\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Неуспех при отварянето на програмен канал за %s"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "Грешка при четене от процес %s"
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "Чакане на заглавни части"
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Получен е един ред на заглавна част с над %u символа"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "Невалиден ред на заглавна част"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "Неизвестен формат на дата"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "Неуспех на избора"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "Допустимото време за свързване изтече"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "Грешка при записа на изходен файл"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "Грешка при записа на файл"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "Грешка при записа на файла"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "Грешка при четене от сървъра"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "Невалидни данни на заглавната част"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "Неуспех при свързването"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "Вътрешна грешка"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "Невъзможно е да се прехвърли в паметта празен файл"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "Изборът %s не е намерен"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Неизвестен тип на абревиатура: „%c“"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Отваряне на конфигурационен файл %s"
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "Ред %d е твърде дълъг (максимум %d)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Синтактична грешка %s:%u: В началото на блока няма име."
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Синтактична грешка %s:%u: Лошо форматиран таг"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Синтактична грешка %s:%u: Излишни символи след стойността"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
+"ниво"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Грешка!"
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Готово"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Неизвестна опция за команден ред „%c“ [от %s]."
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Опцията за команден ред %s не е разпозната"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Опцията за команден ред %s не е булева"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Опция %s изисква аргумент."
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Опция %s: Значението трябва да има =<val>."
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Опция %s изисква аргумент цяло число, не „%s“"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Опция „%s“ е твърде дълга"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Смисълът %s не е ясен, опитайте true или false."
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Невалидна операция %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Неуспех при преминаването в %s"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "Неуспех при намирането на атрибутите на cdrom"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr ""
+"Не се използва заключване за файл за заключване %s, който е само за четене"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Неуспех при отварянето на файл за заключване %s"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr ""
+"Не се използва заключване за файл за заключване %s, който е монтиран по NFS"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Неуспех при достъпа до заключване %s"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Изчака се завършването на %s, но той не беше пуснат"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Подпроцесът %s върна код за грешка (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Подпроцесът %s завърши неочаквано"
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "Неуспех при отварянето на файла %s"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr ""
+"грешка при четене, все още има %lu за четене, но няма нито един останал"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "грешка при запис, все още име %lu за запис, но не успя"
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "Проблем при затварянето на файла"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "Проблем при премахването на връзка към файла"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "Проблем при синхронизиране на файла"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "Празен кеш на пакети"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "Файлът за кеш на пакети е повреден"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "Файлът за кеш на пакети е несъвместима версия"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Тази версия на APT не поддържа система за версии „%s“"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "Кешът на пакети е бил направен за различна архитектура"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "Зависи от"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "Предварително зависи от"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "Предлага се"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "Препоръчва се"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "Конфликтира с"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "Заменя"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "Изважда от употреба"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "важен"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "изискван"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "стандартен"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "незадължителен"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "допълнителен"
+
+#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+msgid "Building dependency tree"
+msgstr "Изграждане на дървото със зависимости"
+
+#: apt-pkg/depcache.cc:61
+msgid "Candidate versions"
+msgstr "Версии кандидати"
+
+#: apt-pkg/depcache.cc:90
+msgid "Dependency generation"
+msgstr "Генериране на зависимости"
+
+#: apt-pkg/tagfile.cc:72
+#, c-format
+msgid "Unable to parse package file %s (1)"
+msgstr "Неуспех при анализирането на пакетен файл %s (1)"
+
+#: apt-pkg/tagfile.cc:102
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Неуспех при анализирането на пакетен файл %s (2)"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)"
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "Отваряне на %s"
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Ред %u в списъка с източници %s е твърде дълъг."
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)"
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен."
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr ""
+"Лошо форматиран ред %u в списъка с източници %s (идентификатор на "
+"производител)"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"В следствие на циклични зависимости от типа „Конфликтира/Предварително "
+"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия "
+"пакет %s. Това често е лошо, но ако наистина искате да го направите, "
+"активирайте опцията APT::Force-LoopBreak."
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Не се поддържа индексен файл от типа „%s“"
+
+#: apt-pkg/algorithms.cc:241
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за "
+"него."
+
+#: apt-pkg/algorithms.cc:1059
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е "
+"причинено от задържани пакети."
+
+#: apt-pkg/algorithms.cc:1061
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Неуспех при коригирането на проблемите, имате задържани счупени пакети."
+
+#: apt-pkg/acquire.cc:62
+#, c-format
+msgid "Lists directory %spartial is missing."
+msgstr "Директорията със списъци %spartial липсва."
+
+#: apt-pkg/acquire.cc:66
+#, c-format
+msgid "Archive directory %spartial is missing."
+msgstr "Директорията за архиви %spartial липсва."
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Изтегляне на файл %li от %li (остават %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Четене на списъка на файловете"
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Неуспех при намирането на драйвер за метод %s."
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Методът %s не стартира правилно"
+
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“."
+
+#: apt-pkg/init.cc:120
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Пакетната система „%s“ не е поддържана"
+
+#: apt-pkg/init.cc:136
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Неуспех при определянето на подходяща пакетна система"
+
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Неуспех при получаването на атрибути на %s."
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани "
+"или отворени."
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Неизвестен тип за отбиване %s"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "Няма указан приоритет (или е нула) на отбиването"
+
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
+msgstr "Кешът има несъвместима система за версии"
+
+#: apt-pkg/pkgcachegen.cc:117
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "Възникна грешка при обработката на %s (NewPackage)"
+
+#: apt-pkg/pkgcachegen.cc:129
+#, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "Възникна грешка при обработката на %s (UsePackage1)"
+
+#: apt-pkg/pkgcachegen.cc:150
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "Възникна грешка при обработката на %s (UsePackage2)"
+
+#: apt-pkg/pkgcachegen.cc:154
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:184
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "Възникна грешка при обработката на %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:188
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "Възникна грешка при обработката на %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:192
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "Възникна грешка при обработката на %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на "
+"APT."
+
+#: apt-pkg/pkgcachegen.cc:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT."
+
+#: apt-pkg/pkgcachegen.cc:241
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "Възникна грешка при обработката на %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:254
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
+
+#: apt-pkg/pkgcachegen.cc:260
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости"
+
+#: apt-pkg/pkgcachegen.cc:574
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
+msgstr "Събиране на информация за „Осигурява“"
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "преименуването се провали, %s (%s -> %s)."
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
+msgstr "Несъответствие на контролна сума MD5"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
+
+#: apt-pkg/acquire-item.cc:753
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
+"ръчно да оправите този пакет (поради пропусната архитектура)."
+
+#: apt-pkg/acquire-item.cc:812
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
+"ръчно да оправите този пакет."
+
+#: apt-pkg/acquire-item.cc:848
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
+
+#: apt-pkg/acquire-item.cc:935
+msgid "Size mismatch"
+msgstr "Несъответствие на размера"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Блокът на производителя %s не съдържа отпечатък"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Използване на точка за монтиране на CD-ROM %s\n"
+"Монтиране на CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "Идентифициране..."
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "Запазен етикет: %s \n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Използване на точка за монтиране на CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "Демонтиране на CD-ROM\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "Чакане за диск...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "Монтиране на CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "Сканиране на диска за индексни файлове...\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+"Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i "
+"подписа.\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "Това не е валидно име, опитайте отново.\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Наименование на този диск: \n"
+"„%s“\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "Копиране на списъците с пакети..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "Запазване на новия списък с източници\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "Записите в списъка с източници за този диск са:\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "Демонтиране на CD-ROM..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "Записани са %i записа.\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Записани са %i записа с %i липсващи файла.\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Записани са %i записа с %i несъответстващи файла\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "Подготвяне на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr "Разпакетиране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Подготвяне на %s за конфигуриране"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "Конфигуриране на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "%s е инсталиран"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Подготвяне за премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "Премахване на %s"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "%s е премахнат"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Подготвяне на %s за конфигуриране"
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Неуспех при премахването на %s"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Връзката прекъсна преждевременно"
+
+#~ msgid "Reading file list"
+#~ msgstr "Четене на списъка с файлове"
+
+#~ msgid "Could not execute "
+#~ msgstr "Неуспех при изпълнението на "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Подготвяне на %s за премахване с конфигурационните файлове"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s е премахнат с конфигурационните файлове"
diff --git a/po/bs.po b/po/bs.po
index 0cb31f3e8..2fe2d7cfe 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -145,14 +145,14 @@ msgstr ""
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -429,7 +429,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
@@ -543,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc: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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -767,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: 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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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"
@@ -843,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -923,158 +923,163 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Urađeno"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1375,7 +1380,7 @@ msgstr ""
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Čitam spisak datoteke"
 
@@ -1419,10 +1424,6 @@ msgstr ""
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1495,12 +1496,12 @@ msgstr "Datoteka nije pronađena"
 msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1627,7 +1628,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1650,7 +1651,7 @@ msgstr ""
 msgid "Query"
 msgstr ""
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr ""
 
@@ -1679,70 +1680,71 @@ msgstr ""
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se sa %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Ne mogu se povezati sa %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr ""
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1758,76 +1760,76 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Čekam na zaglavlja"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr ""
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
@@ -2119,12 +2121,12 @@ msgstr "Verzije kandidata"
 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
@@ -2218,11 +2220,18 @@ msgstr ""
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Čitam spisak datoteke"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2361,31 +2370,35 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr ""
 
@@ -2528,13 +2541,13 @@ msgstr "Preporučuje"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
+msgid "Preparing to completely remove %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
diff --git a/po/ca.po b/po/ca.po
index b0b35e935..b63109932 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,15 +1,15 @@
 # Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006 Software in the Public Interest, Inc.
 # Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
 # Matt Bonner <mateubonet@yahoo.com>, 2003.
-# Jordi Mallach <jordi@debian.org>, 2004, 2005.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-07-19 01:31+0200\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-02-05 22:00+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -148,14 +148,14 @@ msgstr "  Taula de versió:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s per a %s %s compilat el %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -199,7 +199,7 @@ msgstr ""
 "    apt-cache [opcions] showsrc paquet1 [paquet2 ...]\n"
 "\n"
 "apt-cache és una eina usada per a manipular fitxers binaris en\n"
-"el cau de APT, i així poder consultar-ne la informació\n"
+"el cau d'APT, i així poder consultar-ne la informació\n"
 "\n"
 "Ordres:\n"
 "   add - Afegeix un fitxer de paquet a la memòria cau de les fonts\n"
@@ -232,19 +232,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 2.1r1 Disc 1»"
 
 #: 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"
+msgstr "Inseriu un disc en la unitat i premeu Intro"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Repetiu aquest procés per a la resta de CD del vostre joc."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -520,7 +516,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink s'ha arribat al límit de %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No es pot determinar l'estat de %s"
@@ -634,79 +630,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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!"
@@ -714,146 +710,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -864,28 +860,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -893,48 +889,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"
@@ -945,50 +941,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "No es pot blocar el directori de la llista"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -996,25 +992,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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1022,7 +1018,7 @@ msgstr ""
 "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
 "especifiqueu una solució)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1034,7 +1030,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1044,119 +1040,124 @@ 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:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "S'instal·laran els següents paquets extres:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 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:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, 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:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "S'està ometent el fitxer ja descarregat «%s»\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita descarregar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Font descarregada %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut descarregar alguns arxius."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1165,7 +1166,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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1174,32 +1175,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1313,9 +1314,9 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-" '%s'\n"
-"en la unitat de '%s' i premeu Intro\n"
+"El medi ha canviat: inseriu el disc amb l'etiqueta\n"
+" «%s»\n"
+"en la unitat «%s» i premeu Intro\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
@@ -1559,7 +1560,7 @@ msgstr "No s'ha pogut canviar al directori d'admininstració %sinfo"
 msgid "Internal error getting a package name"
 msgstr "S'ha produït un error intern en obtenir un nom de paquet"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "S'està llegint el llistat de fitxers"
 
@@ -1606,10 +1607,6 @@ msgstr "S'ha produït un error intern en afegir una desviació"
 msgid "The pkg cache must be initialized first"
 msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "S'està llegint la llista de fitxers"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1675,20 +1672,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "No es pot muntar el CD-ROM en %s, potser estigui encara en ús."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Fitxer no trobat"
+msgstr "No s'ha trobat el disc"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Fitxer no trobat"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
@@ -1817,7 +1813,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1840,7 +1836,7 @@ msgstr "Ha fallat la transferència de dades, el servidor ha dit '%s'"
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "No es pot invocar"
 
@@ -1869,73 +1865,74 @@ msgstr "No es pot iniciar la connexió amb %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "No s'ha pogut connectar amb %s:%s (%s), temps de connexió excedit"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No s'ha pogut connectar amb %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "S'està connectant amb %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No s'ha pogut resoldre '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "S'ha produït un error temporal en resoldre '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "No es pot connectar amb %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "No s'ha pogut resoldre '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està "
 "sortint."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error intern: La signatura és correcta, però no s'ha pogut determinar "
 "l'emprempta digital de la clau!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "S'ha trobat almenys una signatura invàlida."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "No s'ha pogut executar "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr " per a verificar la signatura (està instal·lat el gnupg?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "S'ha produït un error desconegut en executar el gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "Les següents signatures són invàlides:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1953,76 +1950,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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "S'estan esperant les capçaleres"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "S'ha aconseguit una sola línia de capçalera més de %u caràcters"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Línia de capçalera incorrecta"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor http ha enviat una capçalera de resposta no vàlida"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor http ha enviat una capçalera de Content-Length no vàlida"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor http ha enviat una capçalera de Content-Range no vàlida"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Aquest servidor http té el suport d'abast trencat"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Error escrivint en el fitxer d'eixida"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Error escrivint en el fitxer"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Error escrivint en el fitxer"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error llegint, el servidor remot ha tancat la connexió"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Error llegint des del servidor"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Error intern"
 
@@ -2078,7 +2075,7 @@ msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt
 #: apt-pkg/contrib/configuration.cc:691
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include aniuats"
+msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats"
 
 #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
 #, c-format
@@ -2313,12 +2310,12 @@ msgstr "Versions candidates"
 msgid "Dependency generation"
 msgstr "Dependències que genera"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "No es pot analitzar el fitxer del paquet %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "No es pot analitzar el fitxer del paquet %s (2)"
@@ -2364,7 +2361,7 @@ 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:244
-#, fuzzy, c-format
+#, 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"
 
@@ -2421,10 +2418,17 @@ msgstr "Falta el directori de llistes %spartial."
 msgid "Archive directory %spartial is missing."
 msgstr "Falta el directori d'arxiu %spartial."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "S'està baixant el fitxer %li de %li (falten %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "S'està llegint el llistat de fitxers"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2437,17 +2441,14 @@ msgid "Method %s did not start correctly"
 msgstr "El mètode %s no s'ha iniciat correctament"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"El medi ha canviat: Si us plau, inseriu el disc amb l'etiqueta\n"
-" '%s'\n"
-"en la unitat de '%s' i premeu Intro\n"
+msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
 
 #: apt-pkg/init.cc:120
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "El sistema d'empaquetament '%s' no està suportat."
+msgstr "El sistema d'empaquetament '%s' no està suportat"
 
 #: apt-pkg/init.cc:136
 msgid "Unable to determine a suitable packaging system type"
@@ -2573,11 +2574,15 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Suma MD5 diferent"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2587,16 +2592,16 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"No ha estat possible localitzar un fitxer pel paquet %s. Això podria "
-"significar que haureu d'arreglar aquest paquet manualment."
+"No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
+"d'arreglar aquest paquet manualment."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2604,9 +2609,9 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
-msgstr "Mida diferent"
+msgstr "La mida no concorda"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
@@ -2710,59 +2715,71 @@ msgstr ""
 "coincidents\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "S'està obrint %s"
+msgstr "S'està preparant %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "S'està obrint %s"
+msgstr "S'està desempaquetant %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "S'està obrint el fitxer de configuració %s"
+msgstr "S'està preparant per a configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "S'està connectant amb %s"
+msgstr "S'està configurant %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instal·lat: "
+msgstr "S'ha instal·lat %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "S'està preparant per a l'eliminació de %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "S'està obrint %s"
+msgstr "S'està eliminant %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Recomana"
+msgstr "S'ha eliminat %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "S'està preparant per a configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "No es pot eliminar %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid "Reading file list"
+#~ msgstr "S'està llegint la llista de fitxers"
+
+#~ msgid "Could not execute "
+#~ msgstr "No s'ha pogut executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "S'està preparant per a eliminar amb la configuració %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "S'ha eliminat amb la configuració %s"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 #~ "ID del proveïdor '%s' desconeguda en la línia %u de la llista de fonts %s"
diff --git a/po/cs.po b/po/cs.po
index e782cd293..837f78065 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,15 +1,15 @@
 # Czech translation of APT
 # This file is put in the public domain.
-# Miroslav Kure <kurem@debian.cz>, 2004.
+# Miroslav Kure <kurem@debian.cz>, 2004-2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-02-11 16:14+0100\n"
+"POT-Creation-Date: 2006-05-08 11:02+0200\n"
+"PO-Revision-Date: 2006-05-14 18:36+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <provoz@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -133,7 +133,7 @@ msgstr "  Kandidát: "
 
 #: cmdline/apt-cache.cc:1532
 msgid "  Package pin: "
-msgstr "  Vypíchnutý balík:"
+msgstr "  Vypíchnutý balík: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
@@ -145,14 +145,14 @@ msgstr "  Tabulka verzí:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s pro %s %s zkompilován na %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -228,19 +228,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Zadejte prosím název tohoto média, např. 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive 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 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 ""
+msgstr "Tento proces opakujte pro všechna zbývající média."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -336,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"
@@ -385,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"
@@ -447,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"
@@ -515,14 +510,14 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Odlinkovací limit %sB dosažen.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 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:603
 #, c-format
@@ -629,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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!"
@@ -710,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Nemohu zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, 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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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"
@@ -938,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Nemohu uzamknout list adresář"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -988,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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nemohu najít balík %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 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:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1025,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1035,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:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 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:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
-msgstr "Propočítávám aktualizaci..."
+msgstr "Propočítávám aktualizaci... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 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:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nemohu najít zdrojový balík pro %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Přeskakuji dříve stažený soubor '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, 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:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 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:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení '%s' selhal.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, 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:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení '%s' selhal.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nemohu získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1238,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"
@@ -1274,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
@@ -1288,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
@@ -1369,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
@@ -1382,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"
@@ -1432,9 +1430,9 @@ 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:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1454,7 +1452,7 @@ msgstr "Rozbaluji %s vícekrát"
 #: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "Adresář %s je divertován"
+msgstr "Adresář %s je odkloněn"
 
 #: apt-inst/extract.cc:147
 #, c-format
@@ -1536,7 +1534,7 @@ msgstr "Nepodařilo se změnit na admin adresář %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Vnitřní chyba při získávání jména balíku"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Čtu výpis souborů"
 
@@ -1583,10 +1581,6 @@ msgstr "Vnitřní chyba při přidávání diverze"
 msgid "The pkg cache must be initialized first"
 msgstr "Cache balíků se musí nejprve inicializovat"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Čtu seznam souborů"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1605,12 +1599,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
@@ -1652,20 +1646,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nemohu odpojit CD-ROM v %s - možná se stále používá."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Soubor nebyl nalezen"
+msgstr "Disk nebyl nalezen."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Selhalo vyhodnocení"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
 
@@ -1769,7 +1762,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"
@@ -1793,7 +1786,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
@@ -1816,7 +1809,7 @@ msgstr "Přenos dat selhal, server řekl '%s'"
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Nemohu vyvolat "
 
@@ -1845,75 +1838,77 @@ msgstr "Nemohu navázat spojení na %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nemohu se připojit k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Připojuji se k %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nemohu zjistit '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné selhání při zjišťování '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Něco hodně ošklivého se přihodilo při zjišťování '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Nemohu se připojit k %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nemohu přistoupit ke klíčence: '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nemohu získat zámek %s"
+msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
+"Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznámá chyba při spouštění gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Následujcící extra balíky budou instalovány:"
+msgstr "Následující podpisy jsou neplatné:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 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
@@ -1925,76 +1920,76 @@ msgstr "Nemohu otevřít rouru pro %s"
 msgid "Read error from %s process"
 msgstr "Chyba čtení z procesu %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Čekám na hlavičky"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http server poslal neplatnou hlavičku odpovědi"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http server poslal neplatnou hlavičku Content-Length"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http server poslal neplatnou hlavičku Content-Range"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
@@ -2117,7 +2112,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
@@ -2286,12 +2281,12 @@ msgstr "Kandidátské verze"
 msgid "Dependency generation"
 msgstr "Generování závislostí"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nelze zpracovat soubor %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nelze zpracovat soubor %s (2)"
@@ -2337,7 +2332,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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ý"
 
@@ -2366,7 +2361,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 ""
@@ -2390,10 +2385,17 @@ msgstr "Adresář seznamů %spartial chybí."
 msgid "Archive directory %spartial is missing."
 msgstr "Archivní adresář %spartial chybí."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Stahuji soubor %li z %li (%s zbývá)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Stahuji soubor %li z %li"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2406,12 +2408,9 @@ 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:120
 #, c-format
@@ -2539,11 +2538,15 @@ msgstr "Chyba IO při ukládání zdrojové cache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "přejmenování selhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Neshoda MD5 součtů"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2552,7 +2555,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2561,14 +2564,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:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
@@ -2673,55 +2676,67 @@ msgstr ""
 "Zapsal jsem %i záznamů s chybějícími (%i) a nesouhlasícími (%i) soubory.\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Otevírám %s"
+msgstr "Připravuji %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Otevírám %s"
+msgstr "Rozbaluji %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Otevírám konfigurační soubor %s"
+msgstr "Připravuji nastavení %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Připojuji se k %s"
+msgstr "Nastavuji %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instalovaná verze: "
+msgstr "Nainstalován %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Připravuji odstranění %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Otevírám %s"
+msgstr "Odstraňuji %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Doporučuje"
+msgstr "Odstraněn %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "Připravuji úplné odstranění %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "Kompletně odstraněn %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Spojení bylo předčasně ukončeno"
+
+#~ msgid "Reading file list"
+#~ msgstr "Čtu seznam souborů"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nemohu spustit "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Připravuji odstranění %s včetně konfiguračních souborů"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Odstraněn %s včetně konfiguračního souboru"
diff --git a/po/cy.po b/po/cy.po
index 03d6fe042..18612e694 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-22 23:07+0200\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -162,14 +162,14 @@ msgstr "  Tabl Fersiynnau:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -244,6 +244,22 @@ msgstr ""
 "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
@@ -524,7 +540,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
@@ -533,12 +549,12 @@ msgstr "Methodd stat() o %s"
 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
@@ -639,82 +655,82 @@ msgstr "Gwall wrth datgysylltu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
 msgid "The following packages have unmet dependencies:"
 msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
 msgid " or"
 msgstr " neu"
 
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:546
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -724,147 +740,147 @@ msgstr ""
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:585
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
 msgid " failed."
 msgstr " wedi methu."
 
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
 msgid " Done"
 msgstr " Wedi Gorffen"
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:664
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain."
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc: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
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
 #, fuzzy
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 
-#: 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 "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -875,29 +891,29 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
 msgid "Abort."
 msgstr "Erthylu."
 
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -905,49 +921,49 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: cmdline/apt-get.cc:1038
+#: cmdline/apt-get.cc:1040
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: cmdline/apt-get.cc:1056
+#: cmdline/apt-get.cc:1058
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc:1069
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
 
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
 # FIXME: punctuation
-#: cmdline/apt-get.cc:1089
+#: cmdline/apt-get.cc:1091
 #, fuzzy, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -959,49 +975,49 @@ msgstr ""
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1133
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
-#: cmdline/apt-get.cc:1284
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
-#: 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."
@@ -1009,27 +1025,27 @@ msgstr ""
 "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
 "rai eu defnyddio yn lle."
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1038,7 +1054,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1541
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1051,7 +1067,7 @@ msgstr ""
 "heb gael eu symud allan o Incoming."
 
 # FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1060,117 +1076,122 @@ msgstr ""
 "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
 "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
 
-#: cmdline/apt-get.cc:1554
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1695
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1856
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
-#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:1935
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1988
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
-#: cmdline/apt-get.cc:2096
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
-#: cmdline/apt-get.cc:2116
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1179,7 +1200,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 
-#: cmdline/apt-get.cc:2220
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1188,34 +1209,34 @@ msgstr ""
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 
-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
-#: cmdline/apt-get.cc:2280
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2374
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2415
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1477,7 +1498,7 @@ msgstr "Ffeil cyfluniad dyblyg %s/%s"
 msgid "Failed to write file %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Methwyd cau ffeil %s"
@@ -1532,7 +1553,8 @@ msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
@@ -1581,7 +1603,7 @@ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 #, fuzzy
 msgid "Reading file listing"
 msgstr "Yn Darllen Rhestr Ffeiliau"
@@ -1633,11 +1655,6 @@ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 msgid "The pkg cache must be initialized first"
 msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
 
-#: apt-inst/deb/dpkgdb.cc:386
-#, fuzzy
-msgid "Reading file list"
-msgstr "Yn Darllen Rhestr Ffeiliau"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, fuzzy, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1716,12 +1733,12 @@ msgstr "Ffeil heb ei ganfod"
 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
@@ -1852,7 +1869,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
@@ -1876,7 +1893,7 @@ msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
@@ -1905,71 +1922,71 @@ msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Methwyd cysylltu i %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Methwyd datrys '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Methwyd cael y clo %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1985,82 +2002,82 @@ msgstr "Methwyd agor pibell ar gyfer %s"
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 
-#: methods/http.cc:344
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
-#: methods/http.cc:490
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 
-#: methods/http.cc:498
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
-#: methods/http.cc:553
+#: methods/http.cc:585
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
-#: methods/http.cc:568
+#: methods/http.cc:600
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
-#: methods/http.cc:570
+#: methods/http.cc:602
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
-#: methods/http.cc:594
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/http.cc:741
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:746
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:769
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/http.cc:797
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:822
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:836
+#: methods/http.cc:874
 #, fuzzy
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
-#: methods/http.cc:838
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:1069
+#: methods/http.cc:1107
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/http.cc:1086
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/http.cc:1177
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
@@ -2073,7 +2090,7 @@ msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
-#: apt-pkg/contrib/strutl.cc:941
+#: apt-pkg/contrib/strutl.cc:938
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
@@ -2198,7 +2215,7 @@ msgstr "Gweithred annilys %s"
 msgid "Unable to stat the mount point %s"
 msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
 
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
@@ -2362,63 +2379,63 @@ msgid "Dependency generation"
 msgstr "Cynhyrchaid Dibyniaeth"
 
 # FIXME: number?
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:94
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 
-#: apt-pkg/sourcelist.cc:89
+#: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
 
-#: apt-pkg/sourcelist.cc:98
+#: apt-pkg/sourcelist.cc:105
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
 
-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:112
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:203
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
-#: apt-pkg/sourcelist.cc:187
+#: apt-pkg/sourcelist.cc:240
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 
-#: apt-pkg/sourcelist.cc:191
+#: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, fuzzy, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
@@ -2471,11 +2488,18 @@ msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 msgid "Archive directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2494,12 +2518,12 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
-#: apt-pkg/init.cc:119
+#: apt-pkg/init.cc:120
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
@@ -2623,12 +2647,16 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
 # FIXME: case
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2637,7 +2665,7 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
-#: apt-pkg/acquire-item.cc:775
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2646,14 +2674,14 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law."
 
-#: apt-pkg/acquire-item.cc:811
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
-#: apt-pkg/acquire-item.cc:898
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
@@ -2796,19 +2824,27 @@ msgid "Removed %s"
 msgstr "Argymell"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
+#, fuzzy
+#~ msgid "Reading file list"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Methwyd cael y clo %s"
+
 #~ msgid "Abort? [Y/n] "
 #~ msgstr "Erthylu? [I/n] "
 
diff --git a/po/da.po b/po/da.po
index b43f81e8f..1ca325c1f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,20 +2,20 @@
 # translation of da.po to Danish
 # Advanced Package Transfer - APT message translation catalog
 # Danish messages
-# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005.
 #
+# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-11-07 15:28+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-01-20 22:23+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:135
@@ -151,14 +151,14 @@ msgstr "  Versionstabel:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s oversat p� %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -517,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " N�ede DeLink-begr�nsningen p� %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Kunne ikke finde %s"
@@ -631,79 +631,79 @@ msgstr "Problem under afl�nkning af %s"
 msgid "Failed to rename %s to %s"
 msgstr "Kunne ikke omd�be %s til %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regul�rt udtryk - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
 msgid "The following packages have unmet dependencies:"
 msgstr "F�lgende pakker har uopfyldte afh�ngigheder:"
 
-#: 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 "F�lgende NYE pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "F�lgende pakker vil blive AFINSTALLERET:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "F�lgende pakker er blevet holdt tilbage:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "F�lgende pakker vil blive opgraderet:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 msgstr "F�lgende pakker vil blive NEDGRADERET:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "F�lgende tilbageholdte pakker vil blive �ndret:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc: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!"
@@ -711,143 +711,143 @@ msgstr ""
 "ADVARSEL: F�lgende essentielle pakker vil blive afinstalleret\n"
 "Dette b�r IKKE ske medmindre du er helt klar over, hvad du laver!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 fuldst�ndigt installerede eller afinstallerede.\n"
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
 msgid "Correcting dependencies..."
 msgstr "Retter afh�ngigheder..."
 
-#: 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 afh�ngigheder"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunne ikke minimere opgraderingss�ttet"
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
 msgid " Done"
 msgstr " F�rdig"
 
-#: 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 k�re 'apt-get -f install'."
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
 msgid "Unmet dependencies. Try using -f."
 msgstr "Uopfyldte afh�ngigheder. Pr�v med -f."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: F�lgende pakkers autensitet kunne ikke verificeres!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
 msgstr "Autentifikationsadvarsel tilsidesat.\n"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
 msgid "Install these packages without verification [y/N]? "
 msgstr "Install�r disse pakker uden verifikation (y/N)? "
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc: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 fuldf�rt"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke l�se nedhentningsmappen"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke l�ses."
 
-#: 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.. St�rrelserne 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 v�re 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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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, g�r 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"
@@ -858,28 +858,28 @@ msgstr ""
 "For at forts�tte, skal du skrive '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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 forts�tte [J/n]? "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -887,49 +887,49 @@ msgstr ""
 "Kunne ikke hente nogle af arkiverne. Pr�v evt. at k�re 'apt-get update' "
 "eller pr�v med --fix-missing."
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift underst�ttes endnu ikke"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc: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 "Bem�rk, at %s v�lges 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 b�r eksplicit v�lge 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"
@@ -940,49 +940,49 @@ msgstr ""
 "anden pakke. Det kan betyde at denne pakke blevet overfl�diggjort eller \n"
 "kun kan hentes fra andre kilder\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr "Dog kan f�lgende 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Kunne ikke l�se listemappen"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -990,25 +990,25 @@ msgstr ""
 "Nogle indeksfiler kunne ikke hentes, de er blevet ignoreret eller de gamle "
 "bruges i stedet."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade �delagde noget"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Bem�rk, v�lger %s som regul�rt udtryk '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du kan muligvis rette det ved at k�re 'apt-get -f install':"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1016,7 +1016,7 @@ msgstr ""
 "Uopfyldte afh�ngigheder. Pr�v 'apt-get -f install' uden pakker (eller angiv "
 "en l�sning)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1027,7 +1027,7 @@ msgstr ""
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilg�ngelige."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1036,114 +1036,119 @@ msgstr ""
 "Siden du kan bad om en enkelt handling, kan pakken h�jst sandsynligt slet\n"
 "ikke installeres og du b�r indsende en fejlrapport for denne pakke."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "F�lgende oplysninger kan hj�lpe dig med at klare situationen:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "�delagte pakker"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "F�lgende yderligere pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Foresl�ede pakker:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "F�rdig"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Probleml�seren �delagde noget"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Overspringer allerede hentet fil '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Skal angive mindst �n pakke at tjekke opbygningsafh�ngigheder for"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunne ikke hente oplysninger om opbygningsafh�ngigheder for %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafh�ngigheder.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1151,7 +1156,7 @@ msgid ""
 msgstr ""
 "%s-afh�ngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1160,32 +1165,32 @@ msgstr ""
 "%s-afh�ngigheden for %s kan ikke opfyldes, da ingen af de tilg�ngelige "
 "udgaver af pakken %s kan tilfredsstille versions-kravene"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Kunne ikke opfylde %s-afh�ngigheden for %s: Den installerede pakke %s er for "
 "ny"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Kunne ikke opfylde %s-afh�ngigheden for %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafh�ngigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafh�ngighederne"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Underst�ttede moduler:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1542,7 +1547,7 @@ msgstr "Kunne ikke skifte til admin-mappen %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Intern fejl under hentning af et pakkenavn"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "L�ser fillisten"
 
@@ -1589,10 +1594,6 @@ msgstr "Intern fejl under tilf�jelse af omrokering"
 msgid "The pkg cache must be initialized first"
 msgstr "pkg-mellemlageret skal initialiseres f�rst"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Indl�ser fillisten"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1666,12 +1667,12 @@ msgstr "Disk blev ikke fundet."
 msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Kunne ikke finde"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive �ndringstidspunkt"
 
@@ -1799,7 +1800,7 @@ msgstr "Tidsudl�b p� datasokkel-forbindelse"
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1822,7 +1823,7 @@ msgstr "Dataoverf�rsel mislykkedes, serveren sagde '%s'"
 msgid "Query"
 msgstr "Foresp�rgsel"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Kunne ikke udf�re "
 
@@ -1851,70 +1852,71 @@ msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudl�b"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunne ikke forbinde til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Forbinder til %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunne ikke oms�tte navnet '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig fejl ved oms�tning af navnet '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Der skete noget underligt under navneoms�tning af '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Kunne ikke forbinde til %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Kunne ikke oms�tte navnet '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Intern fejl: Gyldig signatur, men kunne ikke afg�re n�gle-fingeraftryk?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "St�dte p� mindst �n ugyldig signatur."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Kunne ikke k�re "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr " for at verificere signaturen (er gnupg installeret?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Ukendt fejl ved k�rsel af gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "F�lgende signaturer var ugyldige:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1932,77 +1934,77 @@ msgstr "Kunne ikke �bne datar�r for %s"
 msgid "Read error from %s process"
 msgstr "L�sefejl fra %s-process"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Afventer hoveder"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fandt en enkelt linje i hovedet p� over %u tegn"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Ugyldig linje i hovedet"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http-serveren sendte et ugyldigt svarhovede"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr ""
 "Denne http-servere har fejlagtig underst�ttelse af intervaller ('ranges')"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Tidsudl�b p� forbindelsen"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved l�sning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Fejl ved l�sning fra server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Intern fejl"
 
@@ -2293,12 +2295,12 @@ msgstr "Kandidatversioner"
 msgid "Dependency generation"
 msgstr "Afh�ngighedsgenerering"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kunne ikke tolke pakkefilen %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunne ikke tolke pakkefilen %s (2)"
@@ -2344,7 +2346,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Ugyldig linje %u i kildelisten %s (type)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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"
 
@@ -2400,11 +2402,18 @@ msgstr "Listemappen %spartial mangler."
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivmappen %spartial mangler."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Henter fil %li ud af %li (%s tilbage)"
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "L�ser fillisten"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2545,11 +2554,16 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "omd�bning mislykkedes, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Der er ingen tilg�ngelige offentlige n�gler for f�lgende n�gle-ID'er:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2558,7 +2572,7 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "n�dt til manuelt at reparere denne pakke. (grundet manglende arch)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2567,13 +2581,13 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "n�dt til manuelt at reparere denne pakke."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "St�rrelsen stemmer ikke"
 
@@ -2717,19 +2731,31 @@ msgid "Removed %s"
 msgstr "Fjernede %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "G�r klar til at fjerne %s inklusive ops�tning"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "G�r klar til at s�tte %s op"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "Fjernede %s inklusive ops�tning"
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Kunne ikke slette %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
 
+#~ msgid "Reading file list"
+#~ msgstr "Indl�ser fillisten"
+
+#~ msgid "Could not execute "
+#~ msgstr "Kunne ikke k�re "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "G�r klar til at fjerne %s inklusive ops�tning"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Fjernede %s inklusive ops�tning"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Ukendt leverand�r-ID '%s' p� linje %u i kildelisten %s"
 
diff --git a/po/de.po b/po/de.po
index 784328894..cadfefe12 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-06-15 18:22+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team:  <de@li.org>\n"
@@ -146,14 +146,14 @@ msgstr "  Versions-Tabelle:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s für %s %s kompiliert am %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -528,7 +528,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-Limit von %sB erreicht.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Kann auf %s nicht zugreifen."
@@ -642,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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"
@@ -723,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 [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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -874,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -903,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"
@@ -955,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« nimmt keine Argumente"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Kann kein Lock auf das Listenverzeichnis bekommen"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1007,27 +1007,27 @@ msgstr ""
 "Einige Indexdateien konnten nicht heruntergeladen werden, sie wurden "
 "ignoriert oder alte an ihrer Stelle benutzt."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Konnte Paket %s nicht finden"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1035,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:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1047,7 +1047,7 @@ msgstr ""
 "instabile Distribution verwenden, einige erforderliche Pakete noch nicht\n"
 "kreiert oder aus Incoming herausbewegt wurden."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1058,119 +1058,124 @@ msgstr ""
 "dass das Paket einfach nicht installierbar ist und eine Fehlermeldung über\n"
 "dieses Paket erfolgen sollte."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Kaputte Pakete"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Berechne Upgrade..."
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Fertig"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kann Quellpaket für %s nicht finden"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, 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:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hole Quelle %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Konnte einige Archive nicht holen."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Build-Dependencies.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1179,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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1188,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Build-Dependencies fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1305,7 +1310,7 @@ msgstr "Hole:"
 
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
-msgstr "Ign  "
+msgstr "Ign "
 
 #: cmdline/acqprogress.cc:114
 msgid "Err "
@@ -1576,7 +1581,7 @@ msgid "Internal error getting a package name"
 msgstr "Interner Fehler beim Holen des Paket-Namens"
 
 # 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Paketlisten werden gelesen"
 
@@ -1623,10 +1628,6 @@ msgstr "Interner Fehler beim Hinzufügen einer Umleitung"
 msgid "The pkg cache must be initialized first"
 msgstr "Der Paketcache muss erst initialisiert werden"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Paketlisten werden gelesen"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1703,12 +1704,12 @@ msgid "File not found"
 msgstr "Datei nicht gefunden"
 
 # looks like someone hardcoded English grammar
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Kann nicht zugreifen."
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Kann Änderungszeitpunkt nicht setzen"
 
@@ -1837,7 +1838,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
 msgid "Unable to accept connection"
 msgstr "Kann Verbindung nicht annehmen"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 
@@ -1860,7 +1861,7 @@ msgstr "Datenübertragung fehlgeschlagen, Server antwortete »%s«"
 msgid "Query"
 msgstr "Abfrage"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Kann nicht aufrufen: "
 
@@ -1890,71 +1891,71 @@ msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Konnte wegen Zeitüberschreitung keine Verbindung mit %s:%s aufbauen (%s)"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Konnte nicht mit %s:%s verbinden (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbinde mit %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Konnte »%s« nicht auflösen"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Kann nicht mit %s:%s verbinden:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Konnte »%s« nicht auflösen"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Konnte Lock %s nicht bekommen"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1970,78 +1971,78 @@ msgstr "Konnte keine Pipe für %s öffnen"
 msgid "Read error from %s process"
 msgstr "Lesefehler von Prozess %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Warte auf Kopfzeilen (header)"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Erhielt einzelne Kopfzeile aus %u Zeichen"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Schlechte Kopfzeile"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Der http-Server sandte eine ungültige Antwort-Kopfzeile"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Der http-Server sandte eine ungültige »Content-Length«-Kopfzeile"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Der http-Server sandte eine ungültige »Content-Range«-Kopfzeile"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Der http-Server unterstützt Dateiteilübertragung nur fehlerhaft."
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Verbindung erlitt Zeitüberschreitung"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben einer Ausgabedatei"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben einer Datei"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
 "geschlossen"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -2333,12 +2334,12 @@ msgstr "Mögliche Versionen"
 msgid "Dependency generation"
 msgstr "Abhängigkeits-Generierung"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kann Paketdatei %s nicht parsen (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kann Paketdatei %s nicht parsen (2)"
@@ -2440,11 +2441,19 @@ msgstr "Listenverzeichnis %spartial fehlt."
 msgid "Archive directory %spartial is missing."
 msgstr "Archivverzeichnis %spartial fehlt."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+# 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Paketlisten werden gelesen"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2597,11 +2606,15 @@ msgstr "E/A-Fehler beim Sichern des Quellcaches"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5-Summe stimmt nicht"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2610,7 +2623,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2619,14 +2632,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:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht"
 
@@ -2772,19 +2785,26 @@ msgid "Removed %s"
 msgstr "Empfiehlt"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Öffne Konfigurationsdatei %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Konnte %s nicht entfernen"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Verbindung zu früh beendet"
 
+#~ msgid "Reading file list"
+#~ msgstr "Paketlisten werden gelesen"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Konnte Lock %s nicht bekommen"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Unbekannte Herstellerkennung »%s« in Zeile %u der Quellliste %s"
 
diff --git a/po/el.po b/po/el.po
index f908c0fa5..7a885072f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,3 +1,4 @@
+# translation of apt_po_el_new.po to Greek
 # translation of apt_po_el.po to
 # translation of apt_po_el.po to Greek
 # translation of apt_po_el.po to
@@ -7,30 +8,31 @@
 # Greek Translation of APT.
 # This file is put in the public domain.
 # Fanis Dokianakis <madf@hellug.gr>, 2003.
-# Konstantinos Margaritis <markos@debian.org>, 2003, 2004.
+# Konstantinos Margaritis <markos@debian.org>, 2003, 2004, 2006.
 # George Papamichelakis <george@step.gr>, 2004.
 # George Papamichalakis <george@step.gr>, 2004.
 # Greek Translation Team <debian-l10n-greek@lists.debian.org>, 2005.
+# quad-nrg.net <galaxico@quad-nrg.net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_el\n"
+"Project-Id-Version: apt_po_el_new\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\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-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-01-18 15:16+0200\n"
+"Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "org>\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Το πακέτο %s έκδοσης %s έχει ανεπίλυτες εξαρτήσεις:\n"
+msgstr "Το πακέτο %s με έκδοση %s έχει ανεπίλυτες εξαρτήσεις:\n"
 
 #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
@@ -159,14 +161,14 @@ msgstr "  Πίνακας Έκδοσης:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s για %s %s είναι μεταγλωττισμένο σε %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -244,18 +246,15 @@ msgstr ""
 #: 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
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Αλλαγή Μέσου: Παρακαλώ εισάγετε το δίσκο με ετικέτα\n"
-" '%s'\n"
-"στη συσκευή '%s' και πιέστε  enter\n"
+msgstr "Παρακαλώ εισάγετε το δίσκο στη συσκευή και πατήστε enter"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Επαναλάβετε την διαδικασία για τα υπόλοιπα CD από το σετ σας."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -535,7 +534,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Αποσύνδεση ορίου του %sB hit.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Αποτυχία εύρεσης της κατάστασης του %s."
@@ -649,80 +648,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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!"
@@ -730,179 +728,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
 
-#: cmdline/apt-get.cc: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:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, 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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -910,49 +909,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"
@@ -964,51 +963,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1016,25 +1015,25 @@ msgstr ""
 "Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
 "στη θέση τους."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1042,7 +1041,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1054,7 +1053,7 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1064,118 +1063,124 @@ msgstr ""
 "το πακέτο αυτό δεν είναι εγκαταστάσιμο και θα πρέπει να κάνετε μια\n"
 "αναφορά σφάλματος για αυτό το πακέτο."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Ετοιμο"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Εσωτερικό Σφάλμα, Η διαδικασία αναβάθμισης χάλασε"
+msgstr ""
+"Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
+"υλικό"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1183,7 +1188,7 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1192,32 +1197,32 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1272,9 +1277,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"
@@ -1470,9 +1475,9 @@ 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:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1574,7 +1579,7 @@ msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο �
 msgid "Internal error getting a package name"
 msgstr "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Ανάγνωση Λίστας Πακέτων"
 
@@ -1618,13 +1623,8 @@ msgid "Internal error adding a diversion"
 msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης"
 
 #: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
 msgid "The pkg cache must be initialized first"
-msgstr "Η cache πακέτων πρέπει να αρχικοποιηθεί πρώτα"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Ανάγνωση Λιστών Αρχείων"
+msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
@@ -1691,20 +1691,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Αδυναμία απόσυναρμογής του CD-ROM στο %s, μπορεί να είναι σε χρήση."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Το αρχείο Δε Βρέθηκε"
+msgstr "Ο δίσκος δεν βρέθηκε."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Το αρχείο Δε Βρέθηκε"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Αποτυχία εύρεσης της κατάστασης"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
 
@@ -1832,7 +1831,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο�
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
@@ -1855,7 +1854,7 @@ msgstr "Αποτυχία κατά τη μεταφορά δεδομένων, ο �
 msgid "Query"
 msgstr "Επερώτηση"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Αδύνατη η εκτέλεση"
 
@@ -1884,75 +1883,78 @@ msgstr "Αδύνατη η αρχικοποίηση της σύνδεσης στ�
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Αδύνατη η σύνδεση στο %s:%s (%s), λήξη χρόνου σύνδεσης"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Σύνδεση στο %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Αδύνατη η εύρεση του '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Αδύνατη η εύρεση του '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του "
+"αποτυπώματος?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Αδύνατο το κλείδωμα %s"
+msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " για την επαλήθευση της υπογραφής (είναι εγκατεστημένο το gnupg?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
+msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Οι παρακάτω υπογραφές δεν ήταν δυνατόν να επαληθευτούν επειδή δεν ήταν "
+"διαθέσιμο το δημόσιο κλειδί:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1964,77 +1966,77 @@ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το
 msgid "Read error from %s process"
 msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Αναμονή επικεφαλίδων"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Ελαττωματική γραμμή επικεφαλίδας"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα απάντησης"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Length"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Ο διακομιστής http έστειλε μια άκυρη επικεφαλίδα Content-Range"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρως το range"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
@@ -2330,12 +2332,12 @@ msgstr "Υποψήφιες Εκδόσεις"
 msgid "Dependency generation"
 msgstr "Παραγωγή Εξαρτήσεων"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
@@ -2381,9 +2383,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2437,10 +2439,17 @@ msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 msgid "Archive directory %spartial is missing."
 msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Κατέβασμα του αρχείου %li του %li (απομένουν %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Ανάγνωση Λίστας Πακέτων"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2453,12 +2462,11 @@ 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:120
 #, c-format
@@ -2507,39 +2515,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."
@@ -2557,14 +2565,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
@@ -2589,11 +2597,15 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
 msgid "rename failed, %s (%s -> %s)."
 msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2602,7 +2614,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2611,7 +2623,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2619,7 +2631,7 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
@@ -2723,55 +2735,67 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία και %i ασύμβατα αρχεία\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Άνοιγμα του %s"
+msgstr "Προετοιμασία του %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Άνοιγμα του %s"
+msgstr "Ξεπακετάρισμα του %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
+msgstr "Προετοιμασία ρύθμισης του %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Σύνδεση στο %s"
+msgstr "Ρύθμιση του %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Εγκατεστημένα: "
+msgstr "Εγκατέστησα το %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Προετοιμασία για την αφαίρεση του %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Άνοιγμα του %s"
+msgstr "Αφαιρώ το %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Συστήνει"
+msgstr "Αφαίρεσα το %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Προετοιμασία ρύθμισης του %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Αποτυχία διαγραφής του %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Η σύνδεση έκλεισε πρόωρα"
+
+#~ msgid "Reading file list"
+#~ msgstr "Ανάγνωση Λιστών Αρχείων"
+
+#~ msgid "Could not execute "
+#~ msgstr "Αδύνατη η εκτέλεση "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Προετοιμασία για αφαίρεση με ρύθμιση του %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Αφαίρεσα με ρύθμιση το %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index f9260d8b9..0cc9ad7b2 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2002-11-10 20:56+0100\n"
-"Last-Translator: Michael Piefel <piefel@debian.org>\n"
+"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,142 +18,142 @@ msgstr ""
 #: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
+msgstr "Package %s version %s has an unmet dep:\n"
 
 #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
 #: cmdline/apt-cache.cc:1508
 #, c-format
 msgid "Unable to locate package %s"
-msgstr ""
+msgstr "Unable to locate package %s"
 
 #: cmdline/apt-cache.cc:232
 msgid "Total package names : "
-msgstr ""
+msgstr "Total package names : "
 
 #: cmdline/apt-cache.cc:272
 msgid "  Normal packages: "
-msgstr ""
+msgstr "  Normal packages: "
 
 #: cmdline/apt-cache.cc:273
 msgid "  Pure virtual packages: "
-msgstr ""
+msgstr "  Pure virtual packages: "
 
 #: cmdline/apt-cache.cc:274
 msgid "  Single virtual packages: "
-msgstr ""
+msgstr "  Single virtual packages: "
 
 #: cmdline/apt-cache.cc:275
 msgid "  Mixed virtual packages: "
-msgstr ""
+msgstr "  Mixed virtual packages: "
 
 #: cmdline/apt-cache.cc:276
 msgid "  Missing: "
-msgstr ""
+msgstr "  Missing: "
 
 #: cmdline/apt-cache.cc:278
 msgid "Total distinct versions: "
-msgstr ""
+msgstr "Total distinct versions: "
 
 #: cmdline/apt-cache.cc:280
 msgid "Total dependencies: "
-msgstr ""
+msgstr "Total dependencies: "
 
 #: cmdline/apt-cache.cc:283
 msgid "Total ver/file relations: "
-msgstr ""
+msgstr "Total ver/file relations: "
 
 #: cmdline/apt-cache.cc:285
 msgid "Total Provides mappings: "
-msgstr ""
+msgstr "Total Provides mappings: "
 
 #: cmdline/apt-cache.cc:297
 msgid "Total globbed strings: "
-msgstr ""
+msgstr "Total globbed strings: "
 
 #: cmdline/apt-cache.cc:311
 msgid "Total dependency version space: "
-msgstr ""
+msgstr "Total dependency version space: "
 
 #: cmdline/apt-cache.cc:316
 msgid "Total slack space: "
-msgstr ""
+msgstr "Total slack space: "
 
 #: cmdline/apt-cache.cc:324
 msgid "Total space accounted for: "
-msgstr ""
+msgstr "Total space accounted for: "
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr ""
+msgstr "Package file %s is out of sync."
 
 #: cmdline/apt-cache.cc:1231
 msgid "You must give exactly one pattern"
-msgstr ""
+msgstr "You must give exactly one pattern"
 
 #: cmdline/apt-cache.cc:1385
 msgid "No packages found"
-msgstr ""
+msgstr "No packages found"
 
 #: cmdline/apt-cache.cc:1462
 msgid "Package files:"
-msgstr ""
+msgstr "Package files:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr ""
+msgstr "Cache is out of sync, can't x-ref a package file"
 
 #: cmdline/apt-cache.cc:1470
 #, c-format
 msgid "%4i %s\n"
-msgstr ""
+msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
 msgid "Pinned packages:"
-msgstr ""
+msgstr "Pinned packages:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgid "(not found)"
-msgstr ""
+msgstr "(not found)"
 
 #. Installed version
 #: cmdline/apt-cache.cc:1515
 msgid "  Installed: "
-msgstr ""
+msgstr "  Installed: "
 
 #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 msgid "(none)"
-msgstr ""
+msgstr "(none)"
 
 #. Candidate Version
 #: cmdline/apt-cache.cc:1522
 msgid "  Candidate: "
-msgstr ""
+msgstr "  Candidate: "
 
 #: cmdline/apt-cache.cc:1532
 msgid "  Package pin: "
-msgstr ""
+msgstr "  Package pin: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
 msgid "  Version table:"
-msgstr ""
+msgstr "  Version table:"
 
 #: cmdline/apt-cache.cc:1556
 #, c-format
 msgid "       %4i %s\n"
-msgstr ""
+msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s for %s %s compiled on %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -190,26 +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
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Media Change: Please insert the disc labelled\n"
-" ‘%s’\n"
-"in the drive ‘%s’ and press enter\n"
+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 ""
+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 ""
@@ -226,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 ""
@@ -245,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"
@@ -327,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"
@@ -342,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"
@@ -363,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
@@ -373,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
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, 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: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: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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
-msgstr ""
+msgstr "Unable to lock the download directory"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
-msgstr ""
+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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -799,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr ""
+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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
-msgstr ""
+msgstr "The update command takes no arguments"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
-msgstr ""
+msgstr "Unable to lock the list directory"
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
+msgstr "Internal error, AllUpgrade broke stuff"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
-msgstr ""
+msgstr "Couldn't find package %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, selecting %s for regex ‘%s’\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -948,166 +1009,183 @@ msgstr ""
 "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a "
 "solution)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
+"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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
+"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:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
-msgstr ""
+msgstr "Broken packages"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
-msgstr ""
+msgstr "The following extra packages will be installed:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
-msgstr ""
+msgstr "Suggested packages:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
-msgstr ""
+msgstr "Recommended packages:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
-msgstr ""
+msgstr "Calculating upgrade..."
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
-msgstr ""
+msgstr "Failed"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
-msgstr ""
+msgstr "Done"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Internal error, problem resolver broke stuff"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr ""
+msgstr "Unable to find a source package for %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Skipping unpack of already unpacked source in %s\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, 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:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Fetch source %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
-msgstr ""
+msgstr "Failed to fetch some archives."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, 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:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
-msgstr ""
+msgstr "Child process failed"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr ""
+msgstr "%s has no build depends.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
-msgstr ""
+msgstr "Failed to process build dependencies"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
-msgstr ""
+msgstr "Supported modules:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1148,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"
@@ -1188,7 +1304,7 @@ msgstr ""
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
-msgstr ""
+msgstr "Unknown package record!"
 
 #: cmdline/apt-sortpkgs.cc:150
 msgid ""
@@ -1203,217 +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: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/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
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
-msgstr ""
+msgstr "Reading file listing"
 
 #: apt-inst/deb/dpkgdb.cc:216
 #, c-format
@@ -1429,53 +1556,49 @@ msgstr ""
 #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
-msgstr ""
+msgstr "Failed reading the list file %sinfo/%s"
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
-msgstr ""
+msgstr "Internal error getting a node"
 
 #: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr ""
+msgstr "Failed to open the diversions file %sdiversions"
 
 #: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
-msgstr ""
+msgstr "The diversion file is corrupted"
 
 #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
 #: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
-msgstr ""
+msgstr "Invalid line in the diversion file: %s"
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
-msgstr ""
+msgstr "Internal error adding a diversion"
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr ""
+msgstr "The pkg cache must be initialized first"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr ""
+msgstr "Failed to find a Package: header, offset %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr ""
+msgstr "Bad ConfFile section in the status file. Offset %lu"
 
 #: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
-msgstr ""
+msgstr "Error parsing MD5. Offset %lu"
 
 #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
 #, c-format
@@ -1483,101 +1606,105 @@ msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "This is not a valid DEB archive, missing ‘%s’ member"
 
 #: apt-inst/deb/debfile.cc:52
-#, fuzzy, c-format
+#, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr "This is not a valid DEB archive, missing ‘%s’ member"
+msgstr "This is not a valid DEB archive, it has no %s or ‘%s’ member"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
 msgid "Couldn't change to %s"
-msgstr ""
+msgstr "Couldn't change to %s"
 
 #: apt-inst/deb/debfile.cc:138
 msgid "Internal error, could not locate member"
-msgstr ""
+msgstr "Internal error, could not locate member"
 
 #: apt-inst/deb/debfile.cc:171
 msgid "Failed to locate a valid control file"
-msgstr ""
+msgstr "Failed to locate a valid control file"
 
 #: apt-inst/deb/debfile.cc:256
 msgid "Unparsable control file"
-msgstr ""
+msgstr "Unparsable control file"
 
 #: methods/cdrom.cc:114
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr ""
+msgstr "Unable to read the cdrom database %s"
 
 #: methods/cdrom.cc:123
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 
 #: methods/cdrom.cc:131
 msgid "Wrong CD-ROM"
-msgstr ""
+msgstr "Wrong CD-ROM"
 
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
+msgstr "Unable to unmount the CD-ROM in %s, it may still be in use."
 
 #: methods/cdrom.cc:169
 msgid "Disk not found."
-msgstr ""
+msgstr "Disk not found."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
-msgstr ""
+msgstr "File not found"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
-msgstr ""
+msgstr "Failed to stat"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 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
@@ -1587,85 +1714,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
-msgstr ""
+msgstr "Problem hashing file"
 
 #: methods/ftp.cc:877
 #, c-format
@@ -1674,7 +1801,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
@@ -1684,202 +1811,205 @@ msgstr "Data transfer failed, server said ‘%s’"
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
-msgstr ""
+msgstr "Query"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
-msgstr ""
+msgstr "Unable to invoke"
 
 #: methods/connect.cc:64
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr ""
+msgstr "Connecting to %s (%s)"
 
 #: methods/connect.cc:71
 #, c-format
 msgid "[IP: %s %s]"
-msgstr ""
+msgstr "[IP: %s %s]"
 
 #: methods/connect.cc:80
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr ""
+msgstr "Could not create a socket for %s (f=%u t=%u p=%u)"
 
 #: methods/connect.cc:86
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr ""
+msgstr "Cannot initiate the connection to %s:%s (%s)."
 
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
+msgstr "Could not connect to %s:%s (%s), connection timed out"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr ""
+msgstr "Could not connect to %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
-msgstr ""
+msgstr "Connecting to %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Could not resolve ‘%s’"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporary failure resolving ‘%s’"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
-msgstr ""
+msgstr "Unable to connect to %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Could not resolve ‘%s’"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "At least one invalid signature was encountered."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Could not resolve ‘%s’"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " to verify signature (is gnupg installed?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Unknown error executing gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "The following signatures were invalid:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
-msgstr ""
+msgstr "Waiting for headers"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr ""
+msgstr "Got a single header line over %u chars"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
-msgstr ""
+msgstr "Bad header line"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "The HTTP server sent an invalid reply header"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "The HTTP server sent an invalid Content-Length header"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "The HTTP server sent an invalid Content-Range header"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "This HTTP server has broken range support"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
-msgstr ""
+msgstr "Unknown date format"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
-msgstr ""
+msgstr "Select failed"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
-msgstr ""
+msgstr "Connection timed out"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
-msgstr ""
+msgstr "Error writing to output file"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
-msgstr ""
+msgstr "Error writing to file"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
-msgstr ""
+msgstr "Error writing to the file"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Error reading from server. Remote end closed connection"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
-msgstr ""
+msgstr "Error reading from server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
-msgstr ""
+msgstr "Bad header data"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
-msgstr ""
+msgstr "Connection failed"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
-msgstr ""
+msgstr "Internal error"
 
 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
-msgstr ""
+msgstr "Cannot mmap an empty file"
 
 #: apt-pkg/contrib/mmap.cc:87
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr ""
+msgstr "Couldn't make mmap of %lu bytes"
 
 #: apt-pkg/contrib/strutl.cc:938
 #, c-format
 msgid "Selection %s not found"
-msgstr ""
+msgstr "Selection %s not found"
 
 #: apt-pkg/contrib/configuration.cc:436
 #, c-format
@@ -1889,42 +2019,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
@@ -1934,17 +2064,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
@@ -1955,22 +2085,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
@@ -1985,234 +2115,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: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
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr ""
+msgstr "Unable to parse package file %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr ""
+msgstr "Unable to parse package file %s (2)"
 
 #: 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: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: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: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: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:203
 #, c-format
 msgid "Opening %s"
-msgstr ""
+msgstr "Opening %s"
 
 #: 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: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:244
-#, fuzzy, c-format
+#, 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: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
@@ -2221,6 +2351,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
@@ -2232,49 +2365,57 @@ 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:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Downloading file %li of %li (%s remaining)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Reading file listing"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr ""
+msgstr "The method driver %s could not be found."
 
 #: apt-pkg/acquire-worker.cc:162
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr ""
+msgstr "Method %s did not start correctly"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
 #, c-format
@@ -2283,12 +2424,12 @@ msgstr "Packaging system ‘%s’ is not supported"
 
 #: 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"
@@ -2296,141 +2437,150 @@ msgstr "You must put some ‘source’ URIs in your sources.list"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
-msgstr ""
+msgstr "The package lists or status file could not be parsed or opened."
 
 #: apt-pkg/cachefile.cc:77
 msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
+msgstr "You may want to run apt-get update to correct these problems"
 
 #: apt-pkg/policy.cc:269
 msgid "Invalid record in the preferences file, no Package header"
-msgstr ""
+msgstr "Invalid record in the preferences file, no Package header"
 
 #: apt-pkg/policy.cc:291
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr ""
+msgstr "Did not understand pin type %s"
 
 #: apt-pkg/policy.cc:299
 msgid "No priority (or zero) specified for pin"
-msgstr ""
+msgstr "No priority (or zero) specified for pin"
 
 #: apt-pkg/pkgcachegen.cc:74
 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:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
+msgstr "MD5Sum mismatch"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
+"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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
+"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:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 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
@@ -2438,46 +2588,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
@@ -2485,96 +2637,110 @@ msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
+"This disc is called: \n"
+"'%s'\n"
 
 #: apt-pkg/cdrom.cc:730
 msgid "Copying package lists..."
-msgstr ""
+msgstr "Copying package lists..."
 
 #: apt-pkg/cdrom.cc:754
 msgid "Writing new source list\n"
-msgstr ""
+msgstr "Writing new source list\n"
 
 #: apt-pkg/cdrom.cc:763
 msgid "Source list entries for this disc are:\n"
-msgstr ""
+msgstr "Source list entries for this disc are:\n"
 
 #: apt-pkg/cdrom.cc:803
 msgid "Unmounting CD-ROM..."
-msgstr ""
+msgstr "Unmounting CD-ROM..."
 
 #: apt-pkg/indexcopy.cc:261
 #, c-format
 msgid "Wrote %i records.\n"
-msgstr ""
+msgstr "Wrote %i records.\n"
 
 #: apt-pkg/indexcopy.cc:263
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+msgstr "Wrote %i records with %i missing files.\n"
 
 #: apt-pkg/indexcopy.cc:266
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+msgstr "Wrote %i records with %i mismatched files\n"
 
 #: apt-pkg/indexcopy.cc:269
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
 #, c-format
 msgid "Preparing %s"
-msgstr ""
+msgstr "Preparing %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
 #, c-format
 msgid "Unpacking %s"
-msgstr ""
+msgstr "Unpacking %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
 #, c-format
 msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Preparing to configure %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
 #, c-format
 msgid "Configuring %s"
-msgstr ""
+msgstr "Configuring %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
 #, c-format
 msgid "Installed %s"
-msgstr ""
+msgstr "Installed %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparing for removal of %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
 #, c-format
 msgid "Removing %s"
-msgstr ""
+msgstr "Removing %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
 #, c-format
 msgid "Removed %s"
-msgstr ""
+msgstr "Removed %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparing to configure %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Failed to remove %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
-msgstr ""
+msgstr "Connection closed prematurely"
+
+#~ msgid "Reading file list"
+#~ msgstr "Reading file list"
+
+#~ msgid "Could not execute "
+#~ msgstr "Could not execute "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparing for remove with config %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Removed with config %s"
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"
diff --git a/po/es.po b/po/es.po
index 15a376a06..ebb2922cb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,10 +6,10 @@
 # Rub�n Porras Campo <nahoo@inicia.es> 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.5.24\n"
+"Project-Id-Version: apt 0.6.42.3exp1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-02-08 20:36+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2005-11-16 17:37+0100\n"
 "Last-Translator: Rub�n Porras Campo <nahoo@inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -149,14 +149,14 @@ msgstr "  Tabla de versi�n:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s para %s %s compilado en %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -342,7 +342,6 @@ msgid "Error processing contents %s"
 msgstr "Error procesando contenidos %s"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -384,12 +383,12 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "Uso: apt-ftparchive [opciones] orden\n"
-"Comandos: packages trayectoria-binaria [archivo-sobrepaso\n"
-"                                      [prefijo-trayectoria]]\n"
-"          sources trayectoria-fuente [archivo-sobrepaso \n"
-"                                     [prefijo-trayectoria]]\n"
-"          contents trayectoria\n"
-"          release trayectoria\n"
+"Comandos: packages ruta-binaria [archivo-predominio\n"
+"                                      [prefijo-ruta]]\n"
+"          sources ruta-fuente [archivo-predominio \n"
+"                                     [prefijo-ruta]]\n"
+"          contents ruta\n"
+"          release ruta\n"
 "          generate config [grupos]\n"
 "          clean config\n"
 "\n"
@@ -399,7 +398,7 @@ msgstr ""
 "\n"
 "apt-ftparchive genera ficheros Package de un �rbol de .debs. El fichero\n"
 "Package contiene los contenidos de todos los campos de control de cada\n"
-"paquete al igual que la suma MD5 y el tama�o del archivo. Se soporta\n"
+"paquete al igual que la suma MD5 y el tama�o del archivo. Se puede usar\n"
 "un archivo de predominio para forzar el valor de Priority y\n"
 "Section.\n"
 "\n"
@@ -407,7 +406,7 @@ msgstr ""
 ".dscs. Se puede utilizar la opci�n --source-override para especificar un\n"
 "fichero de predominio de fuente.\n"
 "\n"
-"Las �rdenes 'packages' y 'sources' deben ejecutarse en la ra�z del\n"
+"Las �rdenes �packages� y �sources� deben ejecutarse en la ra�z del\n"
 "�rbol. BinaryPath debe apuntar a la base de la b�squeda\n"
 "recursiva, y el archivo de predominio debe de contener banderas de\n"
 "predominio. Se a�ade Pathprefix a los campos de nombre de fichero\n"
@@ -423,7 +422,7 @@ msgstr ""
 "  -q    Silencioso\n"
 "  -d=?  Selecciona la base de datos de cach� opcional \n"
 "  --no-delink Habilita modo de depuraci�n delink\n"
-"  --contents  Generaci�n del contenido del archivo 'Control'\n"
+"  --contents  Generaci�n del contenido del archivo �Control�\n"
 "  -c=?  Lee este archivo de configuraci�n\n"
 "  -o=?  Establece una opci�n de configuraci�n arbitraria"
 
@@ -526,7 +525,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink se ha llegado al l�mite de %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "No pude leer %s"
@@ -640,259 +639,258 @@ msgstr "Hay problemas desligando %s"
 msgid "Failed to rename %s to %s"
 msgstr "Fall� el renombre de %s a %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilaci�n de expresiones regulares - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc: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 instalar�n 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 ELIMINAR�N:"
 
-#: 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 actualizar�n los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Se DESACTUALIZAR�N los siguientes paquetes:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "Se cambiar�n los siguientes paquetes retenidos:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por %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 ""
-"AVISO: Se van a eliminar los siguientes paquetes esenciales\n"
-"�Esto NO debe hacerse a menos que sepa exactamente lo que est� haciendo!"
+"AVISO: Se van a eliminar los siguientes paquetes esenciales.\n"
+"�NO debe hacerse a menos que sepa exactamente lo que est� haciendo!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu actualizados, %lu se instalar�n, "
 
-#: 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 actualizaci�n"
 
-#: 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 ""
+msgstr "Aviso de autenticaci�n ignorado.\n"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
 msgid "Install these packages without verification [y/N]? "
 msgstr "�Instalar estos paquetes sin verificaci�n [s/N]? "
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc: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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 tama�os 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 utilizar�n %sB de espacio de disco adicional despu�s 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 liberar�n %sB despu�s de desempaquetar.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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 operaci�n 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
-#, 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 ""
 "Est� a punto de hacer algo potencialmente da�ino\n"
-"Para continuar escriba la frase '%s'\n"
+"Para continuar escriba la frase �%s�\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de s�lo descarga"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -900,47 +898,47 @@ msgstr ""
 "No se pudieron obtener algunos archivos, �quiz�s deba ejecutar\n"
 "apt-get update o deba intentarlo de nuevo con --fix-missing?"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Actualmente no est�n soportados --fix-missing e intercambio de medio"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc: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 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 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 actualizaci�n 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 expl�citamente 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"
@@ -951,49 +949,49 @@ msgstr ""
 "a �l. Esto puede significar que el paquete falta, est� obsoleto o s�lo se\n"
 "encuentra disponible desde alguna otra fuente\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc: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 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 "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 versi�n m�s 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 Distribuci�n '%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 versi�n '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versi�n seleccionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "El comando de actualizaci�n no toma argumentos"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "No se pudo bloquear el directorio de listas"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1001,25 +999,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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompi� cosas"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, seleccionando %s para la expresi�n regular '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1027,7 +1025,7 @@ msgstr ""
 "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
 "especifique una soluci�n)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1039,7 +1037,7 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1049,118 +1047,123 @@ msgstr ""
 "paquete simplemente no sea instalable y deber�a de rellenar un informe de\n"
 "error contra ese paquete."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente informaci�n puede ayudar a resolver la situaci�n:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Se instalar�n los siguientes paquetes extras:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualizaci�n... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Fall�"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Listo"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de soluci�n de problemas rompi�\n"
 "algunas cosas"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "Debe especificar al menos un paquete para obtener su c�digo fuente"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, 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:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fall� la orden de desempaquetamiento '%s'.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Compruebe que el paquete �dpkg-dev� est� instalado.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fall� la orden de construcci�n '%s'.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Fall� el proceso hijo"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus\n"
 "dependencias de construcci�n"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "No se pudo obtener informaci�n de dependencias de construcci�n para %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcci�n.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1169,7 +1172,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
 "encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1178,32 +1181,32 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque ninguna versi�n\n"
 "disponible del paquete %s satisface los requisitos de versi�n"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No se pudieron satisfacer las dependencias de construcci�n de %s."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcci�n"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "M�dulos soportados:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1460,9 +1463,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Archivo de configuraci�n duplicado %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
-msgstr "Fall� el cierre del archivo %s"
+msgstr "Fall� la escritura del archivo %s"
 
 #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1565,7 +1568,7 @@ msgstr "No pude cambiarme al directorio de administraci�n %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Error interno obteniendo un Nombre de Paquete"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Leyendo Listado de Archivos"
 
@@ -1612,10 +1615,6 @@ msgstr "Error interno agregando una desviaci�n"
 msgid "The pkg cache must be initialized first"
 msgstr "El cach� del paquete debe de inicializarse primero"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Leyendo Lista de Archivos"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1681,20 +1680,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "No pude desmontar el CD-ROM de %s, tal vez todav�a este en uso."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Fichero no encontrado"
+msgstr "Disco no encontrado."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "No pude leer"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "No pude poner el tiempo de modificaci�n"
 
@@ -1822,7 +1820,7 @@ msgstr "Expir� conexi�n a socket de datos"
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexi�n"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
@@ -1845,7 +1843,7 @@ msgstr "Fall� transferencia de datos, el servidor dijo '%s'"
 msgid "Query"
 msgstr "Consulta"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "No pude invocar "
 
@@ -1874,75 +1872,78 @@ msgstr "No puedo iniciar la conexi�n a %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "No pude conectarme a %s:%s (%s), expir� tiempo para conexi�n"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "No pude conectarme a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "No pude resolver '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal al resolver '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Algo raro pas� resolviendo '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "No pude conectarme a %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "No pude resolver '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
+"E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Error interno: Firma correcta, pero no se pudo determinar su huella digital?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "No se pudo bloquear %s"
+msgstr "Se encontr� al menos una firma inv�lida."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " para verificar la firma (�est� instalado gnupg?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Error desconocido ejecutando gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Se instalar�n los siguientes paquetes extras:"
+msgstr "Las siguientes firms fueron inv�lidas:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Las firmas siguientes no se pudieron verificar porque su llave p�blica no "
+"est� disponible:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1954,76 +1955,76 @@ msgstr "No pude abrir una tuber�a para %s"
 msgid "Read error from %s process"
 msgstr "Error de lectura de %s procesos"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtuve una sola l�nea de cabecera arriba de %u caracteres"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Mala l�nea de cabecera"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "El servidor de http envi� una cabecera de respuesta inv�lida"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "El servidor de http envi� una cabecera de Content-Length inv�lida"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "El servidor de http envi� una cabecera de Content-Range inv�lida"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "�ste servidor de http tiene el soporte de alcance roto"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Fall� la selecci�n"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Expir� la conexi�n"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerr� la conexi�n."
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Fallo la conexi�n"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -2318,12 +2319,12 @@ msgstr "Versiones candidatas"
 msgid "Dependency generation"
 msgstr "Generaci�n de dependencias"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "No se pudo tratar el archivo de paquetes %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "No se pudo tratar el archivo de paquetes %s (2)"
@@ -2369,7 +2370,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "L�nea %u mal formada en lista de fuentes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' desconocido en la l�nea %u de lista de fuentes %s"
 
@@ -2427,10 +2428,17 @@ msgstr "Falta el directorio de listas %spartial."
 msgid "Archive directory %spartial is missing."
 msgstr "Falta el directorio de archivos %spartial."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Descargando fichero %li de %li (falta %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Leyendo Listado de Archivos"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2443,12 +2451,9 @@ msgid "Method %s did not start correctly"
 msgstr "El m�todo %s no se inici� correctamente"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Cambio de medio: Por favor inserte el disco etiquetado\n"
-" '%s'\n"
-"en la unidad '%s' y presione Intro\n"
+msgstr "Por favor, inserte el disco �%s� en la unidad �%s� y presione Intro"
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2581,11 +2586,15 @@ msgstr "Error de E/S guardando cach� fuente"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "fall� el cambio de nombre, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 difiere"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2595,7 +2604,7 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2604,7 +2613,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:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2612,7 +2621,7 @@ msgstr ""
 "Los archivos de �ndice de paquetes est�n corrompidos. El campo 'Filename:' "
 "no existe para para el paquete %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "El tama�o difiere"
 
@@ -2717,59 +2726,71 @@ msgstr ""
 "%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Hay problemas abriendo %s"
+msgstr "Preparando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Abriendo %s"
+msgstr "Desempaquetando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Abriendo fichero de configuraci�n %s"
+msgstr "Prepar�ndose para configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Conectando a %s"
+msgstr "Configurando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instalados: "
+msgstr "%s instalado"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Prepar�ndose para eliminar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Abriendo %s"
+msgstr "Eliminando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Recomienda"
+msgstr "%s eliminado"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Prepar�ndose para configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "No pude borrar %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "La conexi�n se cerr� prematuramente"
 
+#~ msgid "Reading file list"
+#~ msgstr "Leyendo Lista de Archivos"
+
+#~ msgid "Could not execute "
+#~ msgstr "No se pudo ejecutar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Prepar�ndose para eliminar con su configuraci�n %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Eliminado con su configuraci�n %s"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 #~ "ID del fabricante '%s' desconocido en la l�nea %u de la lista de\n"
diff --git a/po/eu.po b/po/eu.po
index 3eefeee2b..f894c6d33 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,34 +1,35 @@
-# translation of apt-eu.po to Basque
+# translation of apt_po_eu.po to librezale
+# translation of apt_po_eu.po to
 # This file is put in the public domain.
-# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
-# Piarres Beobide <pi@beobide.net>, 2005.
 #
+# Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
+# Piarres Beobide <pi@beobide.net>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-11-07 22:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-05-26 23:18+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
-"Language-Team: librezale.org <librezale@librezale.org>\n"
+"Language-Team: librezale <librezale@librezale.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "\n"
 
 #: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "%s paketeak (%s bertsioa) mendekotasun-arazo bat du:\n"
+msgstr "%s paketeak (%s bertsioa) mendekotasun arazo bat du:\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 "Ezin da %s paketea lokalizatu"
+msgstr "Ezin da %s paketea kokatu"
 
 #: cmdline/apt-cache.cc:232
 msgid "Total package names : "
@@ -40,7 +41,7 @@ msgstr "  Pakete normalak:"
 
 #: cmdline/apt-cache.cc:273
 msgid "  Pure virtual packages: "
-msgstr "  Pakete birtual puruak:"
+msgstr "  Pakete birtual hutsak:"
 
 #: cmdline/apt-cache.cc:274
 msgid "  Single virtual packages: "
@@ -60,7 +61,7 @@ msgstr "Bertsio Ezberdinak Guztira: "
 
 #: cmdline/apt-cache.cc:280
 msgid "Total dependencies: "
-msgstr "Dependentziak Guztira: "
+msgstr "Mendekotasunak Guztira: "
 
 #: cmdline/apt-cache.cc:283
 msgid "Total ver/file relations: "
@@ -72,11 +73,11 @@ msgstr "Guztira Saltzaile Mapatzea: "
 
 #: cmdline/apt-cache.cc:297
 msgid "Total globbed strings: "
-msgstr "Guztira beteratutakokateak: "
+msgstr "Guztira bateratutako kateak: "
 
 #: cmdline/apt-cache.cc:311
 msgid "Total dependency version space: "
-msgstr "Guztira bertsio dependentzi lekua: "
+msgstr "Guztira bertsio mendekotasun lekua: "
 
 #: cmdline/apt-cache.cc:316
 msgid "Total slack space: "
@@ -84,12 +85,12 @@ msgstr "Guztira galdutako tokia:"
 
 #: cmdline/apt-cache.cc:324
 msgid "Total space accounted for: "
-msgstr "Guztira erregitratutako lekua: "
+msgstr "Guztira erregistratutako lekua: "
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "%s pakete-fitxategia ez dago sinkronizatuta."
+msgstr "%s pakete fitxategia ez dago sinkronizatuta."
 
 #: cmdline/apt-cache.cc:1231
 msgid "You must give exactly one pattern"
@@ -101,13 +102,13 @@ msgstr "Ez da paketerik aurkitu"
 
 #: cmdline/apt-cache.cc:1462
 msgid "Package files:"
-msgstr "Pakete Fitxatefiak:"
+msgstr "Pakete Fitxategiak:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
-"Cachea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
-"pakete-fitxategi bati"
+"Katxea ez dago sinkronizatuta, ezin zaio erreferentziarik (x-ref) egin "
+"pakete fitxategi bati"
 
 #: cmdline/apt-cache.cc:1470
 #, c-format
@@ -144,21 +145,21 @@ msgstr "  Paketearen pin-a:"
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
 msgid "  Version table:"
-msgstr "  Bertsio tabla:"
+msgstr "  Bertsio taula:"
 
 #: cmdline/apt-cache.cc:1556
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s (%s %s) konpilatua: %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -201,44 +202,43 @@ msgstr ""
 "           apt-cache [aukerak] showpkg pak1 [pak2 ...]\n"
 "           apt-cache [aukerak] showsrc pak1 [pak2 ...]\n"
 "\n"
-"APTren cache-fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n"
-"den behe-mailako tresna bat da, apt-cache.\n"
+"APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n"
+"den behe mailako tresna bat da, apt-cache.\n"
 "Komandoak:\n"
-"   add - Pakete-fitxategi bat gehitzen du iturburuko cachean\n"
-"   gencaches - Bi cacheak sortzen ditu: paketeena eta iturburuena\n"
+"   add - Pakete fitxategi bat gehitzen du iturburuko katxean\n"
+"   gencaches - Bi katxeak sortzen ditu: paketeena eta iturburuena\n"
 "   showpkg - Pakete baten informazio orokorra erakusten du\n"
-"   showsrc - Iturburu-erregistroak erakusten ditu\n"
+"   showsrc - Iturburu erregistroak erakusten ditu\n"
 "   stats - Oinarrizko estatistika batzuk erakusten ditu\n"
 "   dump - Fitxategi osoa erakusten du formatu laburrean\n"
 "   dumpavail - Fitxategi erabilgarri bat irteera estandarrean inprimatu\n"
 "   unmet - Bete gabeko mendekotasunak erakusten ditu\n"
-"   search - Adierazpen erregularrak bilatzen ditu pakete-zerrendan \n"
+"   search - Adierazpen erregularrak bilatzen ditu pakete zerrendan \n"
 "   show - Paketearen erregistro irakurgarri bat erakusten du\n"
 "   depends - Pakete baten mendekotasunak erakusten ditu\n"
 "   rdepends - Pakete baten mendekotasun alderantzikatuak erakusten ditu\n"
 "   pkgnames - Pakete guztien izenak zerrendatzen ditu\n"
-"   dotty - GraphVis-ekin erabiltzeko pakete-grafikoak sortzen ditu\n"
-"   xvcg - xvcg-ekin erabiltzeko pakete-grafikoak sortzen ditu\n"
+"   dotty - GraphVis-ekin erabiltzeko pakete grafikoak sortzen ditu\n"
+"   xvcg - xvcg-ekin erabiltzeko pakete grafikoak sortzen ditu\n"
 "   policy - Gidalerroen ezarpenak erakusten ditu\n"
 "\n"
 "Aukerak:\n"
-"  -h   Laguntza-testu hau.\n"
-"  -p=? Paketearen cachea.\n"
-"  -s=? Iturburuaren cachea.\n"
-"  -q   Desgaitu progresio-adierazlea.\n"
+"  -h   Laguntza testu hau.\n"
+"  -p=? Paketearen katxea.\n"
+"  -s=? Iturburuaren katxea.\n"
+"  -q   Ezgaitu progresio adierazlea.\n"
 "  -i   Mendekotasun nagusiak soilik erakutsi.\n"
-"  -c=? Irakurri konfigurazio-fitxategi hau\n"
-"  -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazioa aukera arbitrario bat. Adib.: -o dir::katxe=/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"
+msgstr "Mesedez idatzi izen bat diskoa honentzat, 'Debian 2.1r1 1 Diskoa' antzerakoa"
 
 #: 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"
+msgstr "Mesedez sar diskoa bat gailuan eta enter sakatu"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -265,16 +265,16 @@ msgid ""
 msgstr ""
 "Erabilera: apt-config [aukerak] komandoa\n"
 "\n"
-"apt-config APT konfigurazio-fitxategia irakurtzeko tresna soil bat da\n"
+"apt-config APT konfigurazio fitxategia irakurtzeko tresna soil bat da\n"
 "\n"
 "Komandoak:\n"
 "   shell - Shell modua\n"
 "   dump - Konfigurazioa erakusten du\n"
 "\n"
 "Aukerak:\n"
-"  -h   Laguntza-testu hau.\n"
-"  -c=? Irakurri konfigurazio-fitxategi hau\n"
-"  -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
+"  -h   Laguntza testu hau.\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazioa aukera arbitrario bat. Adib.: -o dir::katxe=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:98
 #, c-format
@@ -300,10 +300,10 @@ msgstr ""
 "informazioa ateratzeko tresna bat da\n"
 "\n"
 "Aukerak:\n"
-"  -h   Laguntza-testu hau\n"
+"  -h   Laguntza testu hau\n"
 "  -t   Ezarri aldi baterako direktorioa\n"
-"  -c=? Irakurri konfigurazio-fitxategi hau\n"
-"  -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazioa aukera arbitrario bat. Adib.: -o dir::katxe=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
 #, c-format
@@ -316,7 +316,7 @@ msgstr "Ezin da debconf bertsioa eskuratu. Debconf instalatuta dago?"
 
 #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
 msgid "Package extension list is too long"
-msgstr "Pakete-luzapenen zerrenda luzeegia da"
+msgstr "Pakete luzapenen zerrenda luzeegia da"
 
 #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
@@ -327,11 +327,11 @@ msgstr "Errorea direktorioa prozesatzean %s"
 
 #: ftparchive/apt-ftparchive.cc:254
 msgid "Source extension list is too long"
-msgstr "Iturburu-luzapenen zerrenda luzeegia da"
+msgstr "Iturburu luzapenen zerrenda luzeegia da"
 
 #: ftparchive/apt-ftparchive.cc:371
 msgid "Error writing header to contents file"
-msgstr "Errorea eduki-fitxategiaren goiburua idaztean"
+msgstr "Errorea eduki fitxategiaren goiburua idaztean"
 
 #: ftparchive/apt-ftparchive.cc:401
 #, c-format
@@ -391,31 +391,31 @@ msgstr ""
 "estilo asko onartzen ditu, erabat automatizatuak nahiz ordezte funtzionalak\n"
 "'dpkg-scanpackages' eta 'dpkg-scansources'erako\n"
 "Package izeneko fitxategiak sortzen ditu .deb fitxategien zuhaitz batetik.\n"
-"Package fitxategiak pakete bakoitzaren kontrol-eremu guztiak izaten ditu,\n"
-"MD5 hash balioa eta fitxategi-tamaina barne. Override fitxategia erabiltzen\n"
-"da lehentasunearen eta sekzioaren balioak behartzeko.\n"
+"Package fitxategiak pakete bakoitzaren kontrol eremu guztiak izaten ditu,\n"
+"MD5 hash balioa eta fitxategi tamaina barne. Override fitxategia erabiltzen\n"
+"da lehentasunaren eta sekzioaren balioak behartzeko.\n"
 "\n"
-"Era berean, iturburu-fitxategiak ere sortzen ditu .dsc fitxategien\n"
+"Era berean, iturburu fitxategiak ere sortzen ditu .dsc fitxategien\n"
 "zuhaitzetik. --source-override aukera erabil daiteke src override \n"
 "fitxategi bat zehazteko.\n"
 "'packages' eta 'sources' komandoa zuhaitzaren erroan exekutatu behar dira.\n"
 "BinaryPath-ek bilaketa errekurtsiboaren oinarria seinalatu behar du, eta\n"
 "override fitxategiak override banderak izan behar ditu. Pathprefix \n"
-"fitxategi-izenen eremuei eransten zaie (halakorik badago). Hona hemen\n"
-"Debian artxiboko erabilera-adibide bat:\n"
+"fitxategi izenen eremuei eransten zaie (halakorik badago). Hona hemen\n"
+"Debian artxiboko erabilera adibide bat:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
 "Aukerak:\n"
-"  -h    Laguntza-testu hau\n"
+"  -h    Laguntza testu hau\n"
 "  --md5 Kontrolatu MD5 sortzea\n"
 "  -s=?  Iturburuaren override fitxategia\n"
 "  -q    Isilik\n"
-"  -d=?  Hautatu aukerako cachearen datu-basea\n"
-"  --no-delink Gaitu delink arazketa-modua\n"
-"  --contents  Kontrolatu eduki-fitxategia sortzea\n"
-"  -c=?  Irakurri konfigurazio-fitxategi hau\n"
-"  -o=?  Ezarri konfigurazio-aukera arbitrario bat"
+"  -d=?  Hautatu aukerako katxearen datubasea\n"
+"  --no-delink Gaitu delink arazketa modua\n"
+"  --contents  Kontrolatu eduki fitxategia sortzea\n"
+"  -c=?  Irakurri konfigurazio fitxategi hau\n"
+"  -o=?  Ezarri konfigurazioa aukera arbitrario bat"
 
 #: ftparchive/apt-ftparchive.cc:762
 msgid "No selections matched"
@@ -424,31 +424,31 @@ msgstr "Ez dago bat datorren hautapenik"
 #: ftparchive/apt-ftparchive.cc:835
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Fitxategi batzuk falta dira `%s' pakete-fitxategien taldean"
+msgstr "Fitxategi batzuk falta dira `%s' pakete fitxategien taldean"
 
 #: ftparchive/cachedb.cc:45
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Datu-basea hondatuta dago; fitxategiari %s.old izena jarri zaio"
+msgstr "Datubasea hondatua dago; fitxategiari %s.old izena jarri zaio"
 
 #: ftparchive/cachedb.cc:63
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
+msgstr "Datubasea zaharra da; %s bertsio berritzen saiatzen ari da"
 
 #: ftparchive/cachedb.cc:73
 #, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "Ezin da ireki %s datu-base fitxategia: %s"
+msgstr "Ezin da ireki %s datubase fitxategia: %s"
 
 #: ftparchive/cachedb.cc:114
 #, c-format
 msgid "File date has changed %s"
-msgstr "Fitxategi-data aldatu egin da: %s"
+msgstr "Fitxategi data aldatu egin da: %s"
 
 #: ftparchive/cachedb.cc:155
 msgid "Archive has no control record"
-msgstr "Artxiboak ez du kontrol-erregistrorik"
+msgstr "Artxiboak ez du kontrol erregistrorik"
 
 #: ftparchive/cachedb.cc:267
 msgid "Unable to get a cursor"
@@ -516,14 +516,14 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-en mugara (%sB) heldu da.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Huts egin du %s(e)tik datuak lortzean"
 
 #: ftparchive/writer.cc:386
 msgid "Archive had no package field"
-msgstr "Artxiboak ez du pakete-eremurik"
+msgstr "Artxiboak ez du pakete eremurik"
 
 #: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 #, c-format
@@ -572,12 +572,12 @@ msgstr "Huts egin du %s override fitxategia irakurtzean"
 #: ftparchive/multicompress.cc:75
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' Kompresio Algoritmo Ezezaguna"
+msgstr "'%s' Konpresio Algoritmo Ezezaguna"
 
 #: ftparchive/multicompress.cc:105
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "%s irteera konprimituak konpresio-tresna bat behar du"
+msgstr "%s irteera konprimituak konpresio tresna bat behar du"
 
 #: ftparchive/multicompress.cc:172 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
@@ -593,7 +593,7 @@ msgstr "Huts egin du sardetzean"
 
 #: ftparchive/multicompress.cc:215
 msgid "Compress child"
-msgstr "Konprimatu Umeak"
+msgstr "Konprimitu Umeak"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
@@ -614,7 +614,7 @@ msgstr "deskonpresorea"
 
 #: ftparchive/multicompress.cc:406
 msgid "IO to subprocess/file failed"
-msgstr "Huts egin du azpiprozesu/fitxategiko S/Iak"
+msgstr "Huts egin du azpiprozesu/fitxategiko S/I-ak"
 
 #: ftparchive/multicompress.cc:458
 msgid "Failed to read while computing MD5"
@@ -630,225 +630,225 @@ 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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "Adierazpen erregularren konpilazio-errorea - %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:"
+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!"
 msgstr ""
 "KONTUZ: Ondorengo funtsezko paketeak kendu egingo dira\n"
-"EZ ezazu horelakorik egin, ez badakizu ondo zertan ari zaren!"
+"EZ ezazu horrelakorik 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, "
+msgstr "%lu bertsio berritua, %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"
+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."
+msgstr "Paketeak ezabatu beharra dute baina 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
-msgstr "Ezin da deskarga-direktorioa blokeatu"
+msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
-msgstr "Ezin izan da iturburu-zerrenda irakurri."
+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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -859,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."
+msgstr "Utzi."
 
-#: 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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -888,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"
+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."
+msgstr "Utzi 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"
+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"
@@ -939,75 +939,75 @@ 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
-msgstr "Ezin da zerrenda-direktorioa blokeatu"
+msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Indize-fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
+"Indize fitxategi batzuk ezin izan dira deskargatu; ez ikusi egin zaie, edo "
 "zaharrak erabili dira haien ordez."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1015,7 +1015,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1027,7 +1027,7 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1036,158 +1036,160 @@ 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:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
-msgstr "Berriketak kalkulatzen... "
+msgstr "Berritzak kalkulatzen... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Eginda"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "Ezin da iturburu-paketerik aurkitu %s(r)entzat"
+msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Iturburu-artxiboetako %sB/%sB eskuratu behar dira.\n"
+msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Iturburu-artxiboetako %sB eskuratu behar dira.\n"
+msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Eskuratu %s iturubura\n"
+msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
+msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "Ezin izan da %s(r)en eraikitze-mendekotasunen informazioa eskuratu"
+msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s: ez du eraikitze-mendekotasunik.\n"
+msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
+"%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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s(r)en eraikitze-mendekotasunak ezin izan dira bete."
+msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
-msgstr "Huts egin du eraikitze-mendekotasunak prozesatzean"
+msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1232,37 +1234,37 @@ msgstr ""
 "           apt-get [aukerak] install|remove pkg1 [pkg2 ...]\n"
 "           apt-get [aukerak] source pkg1 [pkg2 ...]\n"
 "\n"
-"apt-get paketeak deskargatu eta instalatzeko komando-lerroko interfaze soil\n"
+"apt-get paketeak deskargatu eta instalatzeko komando lerroko interfaze soil\n"
 "bat da. Gehien erabiltzen diren komandoak eguneratzekoa eta instalatzekoa \n"
 "dira: update eta install.\n"
 "\n"
 "Komandoak:\n"
-"   update - Eskuratu pakete-zerrenda berriak\n"
-"   upgrade - Egin bertsio-berritzea\n"
+"   update - Eskuratu pakete zerrenda berriak\n"
+"   upgrade - Egin bertsio berritzea\n"
 "   install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n"
 "   remove - Kendu paketeak\n"
-"   source - Deskargatu iturburu-artxiboak\n"
-"   build-dep - Konfiguratu iturburu-paketeen eraikitze-dependentziak\n"
-"   dist-upgrade - Banaketaren bertsio-berritzea: ikus apt-get(8)\n"
+"   source - Deskargatu iturburu artxiboak\n"
+"   build-dep - Konfiguratu iturburu paketeen eraikitze mendekotasunak\n"
+"   dist-upgrade - Banaketaren bertsio berritzea: ikus apt-get(8)\n"
 "   dselect-upgrade - Jarraitu dselect hautapenak\n"
-"   clean - Ezabatu deskargatutako artxibo-fitxategiak\n"
-"   autoclean - Ezabatu deskargatutako artxibo-fitxategi zaharrak\n"
+"   clean - Ezabatu deskargatutako artxibo fitxategiak\n"
+"   autoclean - Ezabatu deskargatutako artxibo fitxategi zaharrak\n"
 "   check - Egiaztatu ez dagoela hautsitako mendekotasunik\n"
 "\n"
 "Aukerak:\n"
-"  -h  Laguntza-testu hau.\n"
-"  -q  Egunkarian erregistratzeko irteera - progresio-adierazlerik gabe\n"
+"  -h  Laguntza testu hau.\n"
+"  -q  Egunkarian erregistratzeko irteera - progresio adierazlerik gabe\n"
 "  -qq Irteerarik ez, erroreentzat izan ezik\n"
 "  -d  Deskargatu bakarrik - EZ instalatu edo deskonprimitu artxiboak\n"
 "  -s  Ekintzarik ez. Simulazio bat egiten du\n"
 "  -y  Galdera guztiei Bai erantzun, galdetu gabe\n"
-"  -f  Saiatu jarraitzen, osotasun-egiaztapenak huts egiten badu\n"
-"  -m  Saiatu jarraitzen, artxiboak ezin badira lokalizatu\n"
-"  -u  Erakutsi bertsio-berritutako paketeen zerrenda ere\n"
-"  -b  Sortu iturburu-paketea lortu ondoren\n"
-"  -V  Erakutsi bertsio-zenbaki xeheak\n"
-"  -c=? Irakurri konfigurazio-fitxategi hau\n"
-"  -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n"
+"  -f  Saiatu jarraitzen, osotasun egiaztapenak huts egiten badu\n"
+"  -m  Saiatu jarraitzen, artxiboak ezin badira kokatu\n"
+"  -u  Erakutsi bertsio berritutako paketeen zerrenda ere\n"
+"  -b  Sortu iturburu paketea lortu ondoren\n"
+"  -V  Erakutsi bertsio zenbaki xeheak\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.:-o dir::cache=/tmp\n"
 "Informazio eta aukera gehiago nahi izanez gero, ikus apt-get(8), \n"
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
@@ -1302,11 +1304,11 @@ msgid ""
 msgstr ""
 "Medio Aldaketa: Mesedez sar\n"
 " '%s'\n"
-"izeneko diska '%s' gailuan eta enter sakatu\n"
+"izeneko diskoa '%s' gailuan eta enter sakatu\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
-msgstr "Pakete-erregistro ezezaguna!"
+msgstr "Pakete erregistro ezezaguna!"
 
 #: cmdline/apt-sortpkgs.cc:150
 msgid ""
@@ -1323,14 +1325,14 @@ msgid ""
 msgstr ""
 "Erabilera: apt-sortpkgs [aukerak] fitxategia1 [fitxategia2...]\n"
 "\n"
-"apt-sortpkgs pakete-fitxategiak ordenatzeko tresna soil bat da. Zein\n"
+"apt-sortpkgs pakete fitxategiak ordenatzeko tresna soil bat da. Zein\n"
 "motatako fitxategia den adierazteko -s aukera erabiltzen da.\n"
 "\n"
 "Aukerak:\n"
-"  -h   Laguntza-testu hau\n"
-"  -s   Erabili iturburu-fitxategien ordenatzea\n"
-"  -c=? Irakurri konfigurazio-fitxategi hau\n"
-"  -o=? Ezarri konfigurazio-aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
+"  -h   Laguntza testu hau\n"
+"  -s   Erabili iturburu fitxategien ordenatzea\n"
+"  -c=? Irakurri konfigurazio fitxategi hau\n"
+"  -o=? Ezarri konfigurazio aukera arbitrario bat. Adib: -o dir::cache=/tmp\n"
 
 #: dselect/install:32
 msgid "Bad default setting!"
@@ -1354,8 +1356,7 @@ 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"
@@ -1378,16 +1379,16 @@ msgstr "Hondatutako artxiboa"
 
 #: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar egiaztapenak huts egin, hondatutakofitxategia"
+msgstr "Tar egiaztapenak huts egin, hondatutako fitxategia"
 
 #: apt-inst/contrib/extracttar.cc:298
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "%u TAR goiburu-mota ezezaguna, %s kidea"
+msgstr "%u TAR goiburu mota ezezaguna, %s kidea"
 
 #: apt-inst/contrib/arfile.cc:73
 msgid "Invalid archive signature"
-msgstr "Artxibo-sinadura baliogabea"
+msgstr "Artxibo sinadura baliogabea"
 
 #: apt-inst/contrib/arfile.cc:81
 msgid "Error reading archive member header"
@@ -1403,7 +1404,7 @@ msgstr "Artxiboa laburregia da"
 
 #: apt-inst/contrib/arfile.cc:135
 msgid "Failed to read the archive headers"
-msgstr "Huts egin artxibo-goiburuak irakurtzean"
+msgstr "Huts egin artxibo goiburuak irakurtzean"
 
 #: apt-inst/filelist.cc:384
 msgid "DropNode called on still linked node"
@@ -1411,11 +1412,11 @@ msgstr "DropNode-ri dei egin zaio oraindik estekatutako nodoan"
 
 #: apt-inst/filelist.cc:416
 msgid "Failed to locate the hash element!"
-msgstr "Huts egin du hash-elementua lokalizatzean!"
+msgstr "Huts egin du hash-elementua kokatzean!"
 
 #: apt-inst/filelist.cc:463
 msgid "Failed to allocate diversion"
-msgstr "Huts egin du desbideratzea lokalizatzean"
+msgstr "Huts egin du desbideratzea kokatzean"
 
 #: apt-inst/filelist.cc:468
 msgid "Internal error in AddDiversion"
@@ -1434,7 +1435,7 @@ msgstr "Desbideratzearen gehitze bikoitza: %s -> %s"
 #: apt-inst/filelist.cc:553
 #, c-format
 msgid "Duplicate conf file %s/%s"
-msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s"
+msgstr "Konfigurazio fitxategi bikoiztua: %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format
@@ -1464,7 +1465,7 @@ msgstr "%s direktorioa desbideratuta dago"
 #: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Paketea desbideratze-helburuan %s/%s idazten saiatzen ari da"
+msgstr "Paketea desbideratze helburuan %s/%s idazten saiatzen ari da"
 
 #: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
@@ -1477,7 +1478,7 @@ msgstr "%s direktorioa ez-direktorio batekin ordezten ari da"
 
 #: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
-msgstr "Huts egin du nodoa bere hash-ontzian lokalizatzean"
+msgstr "Huts egin du nodoa bere hash-ontzian kokatzean"
 
 #: apt-inst/extract.cc:287
 msgid "The path is too long"
@@ -1486,7 +1487,7 @@ msgstr "Bide-izena luzeegia da"
 #: apt-inst/extract.cc:417
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "Gainidatzi pakete-konkordantzia %s(r)en bertsiorik gabe"
+msgstr "Gainidatzi pakete konkordantzia %s(r)en bertsiorik gabe"
 
 #: apt-inst/extract.cc:434
 #, c-format
@@ -1522,7 +1523,7 @@ msgstr "Huts egin du %sinfo-tik datuak lortzean"
 
 #: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
-msgstr "info eta temp direktorioek fitxategi-sistema berean egon behar dute"
+msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute"
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
@@ -1534,14 +1535,14 @@ msgstr "Pakete Zerrenda irakurtzen"
 #: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
-msgstr "Huts egin du %sinfo administrazio-direktoriora aldatzean"
+msgstr "Huts egin du %sinfo administrazio direktoriora aldatzean"
 
 #: 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 "Barne errorea pakete Izen bat eskuratzerakoan"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Fitxategi zerrendaketa irakurtzen"
 
@@ -1552,14 +1553,14 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"Huts egin du '%sinfo/%s' zerrenda-fitxategia irekitzean. Fitxategi hori ezin "
+"Huts egin du '%sinfo/%s' zerrenda fitxategia irekitzean. Fitxategi hori ezin "
 "baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala paketearen "
 "bertsio bera!"
 
 #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
-msgstr "Huts egin du %sinfo/%s zerrenda-fitxategia irakurtzean"
+msgstr "Huts egin du %sinfo/%s zerrenda fitxategia irakurtzean"
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
@@ -1572,13 +1573,13 @@ msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean"
 
 #: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
-msgstr "Desbideratze-fitxategia hondatuta dago"
+msgstr "Desbideratze fitxategia hondatua dago"
 
 #: 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 "Lerro baliogabea desbideratze-fitxategian: %s"
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
@@ -1586,11 +1587,7 @@ msgstr "Barne errorea desbideratze bat gehitzean"
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
-msgstr "Paketearen cachea hasieratu behar da lehendabizi"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Fitxategi zerrenda irakurtzen"
+msgstr "Paketearen katxea hasieratu behar da lehendabizi"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
@@ -1600,7 +1597,7 @@ msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu"
 #: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Okerreko ConfFile sekzioa egoera-fitxategian. Desplazamendua %lu"
+msgstr "Okerreko ConfFile atala egoera fitxategian. Desplazamendua %lu"
 
 #: apt-inst/deb/dpkgdb.cc:470
 #, c-format
@@ -1615,8 +1612,7 @@ 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 baliozko DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
@@ -1629,7 +1625,7 @@ msgstr "Barne Errorea, ezin da atala kokatu"
 
 #: apt-inst/deb/debfile.cc:171
 msgid "Failed to locate a valid control file"
-msgstr "Ezin izan da baliozko kontrol-fitxategi bat lokalizatu"
+msgstr "Ezin izan da baliozko kontrol fitxategi bat kokatu"
 
 #: apt-inst/deb/debfile.cc:256
 msgid "Unparsable control file"
@@ -1638,7 +1634,7 @@ msgstr "Kontrol fitxategi ezin analizagarria"
 #: methods/cdrom.cc:114
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "Ezin da cdrom-eko %s datu-basea irakurri"
+msgstr "Ezin da cdrom-eko %s datubasea irakurri"
 
 #: methods/cdrom.cc:123
 msgid ""
@@ -1655,25 +1651,24 @@ 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 %s(e)ko CD-ROMa desmuntatu; 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."
-msgstr "Ez da diska aurkitu"
+msgstr "Ez da diskoa aurkitu"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Huts egin du atzitzean"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
-msgstr "Huts egin du aldaketa-ordua ezartzean"
+msgstr "Huts egin du aldaketa ordua ezartzean"
 
 #: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
@@ -1729,7 +1724,7 @@ msgstr "TYPEk huts egin du, eta zerbitzariak hau esan du: %s"
 
 #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
-msgstr "Konexioaren denbora-muga"
+msgstr "Konexioaren denbora muga"
 
 #: methods/ftp.cc:335
 msgid "Server closed the connection"
@@ -1737,7 +1732,7 @@ msgstr "Zerbitzariak konexioa itxi du"
 
 #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
 msgid "Read error"
-msgstr "Irakurketa-errorea"
+msgstr "Irakurketa errorea"
 
 #: methods/ftp.cc:345 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
@@ -1745,11 +1740,11 @@ msgstr "Erantzun batek bufferrari gainez eragin dio."
 
 #: methods/ftp.cc:362 methods/ftp.cc:374
 msgid "Protocol corruption"
-msgstr "Protokolo-hondatzea"
+msgstr "Protokolo hondatzea"
 
 #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
 msgid "Write error"
-msgstr "Idazketa-errorea"
+msgstr "Idazketa errorea"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
@@ -1757,8 +1752,7 @@ 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."
@@ -1787,7 +1781,7 @@ msgstr "Ezin da PORT komandoa bidali"
 #: methods/ftp.cc:789
 #, c-format
 msgid "Unknown address family %u (AF_*)"
-msgstr "Helbide-familia baliogabea: %u (AF_*)"
+msgstr "Helbide familia baliogabea: %u (AF_*)"
 
 #: methods/ftp.cc:798
 #, c-format
@@ -1796,13 +1790,13 @@ msgstr "EPRTek huts egin du, eta zerbitzariak hau esan du: %s"
 
 #: methods/ftp.cc:818
 msgid "Data socket connect timed out"
-msgstr "Datu-socket konexioak denbora-muga gainditu du"
+msgstr "Datu-socket konexioak denbora muga gainditu du"
 
 #: methods/ftp.cc:825
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1813,19 +1807,19 @@ msgstr "Ezin da fitxategia lortu; zerbitzariak hau esan du: '%s'"
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
-msgstr "Datu-socketak denbora-muga gainditu du"
+msgstr "Datu-socketak denbora muga gainditu du"
 
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "Datu-transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
+msgstr "Datu transferentziak huts egin du, eta zerbitzariak hau esan du: '%s'"
 
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
 msgstr "Kontsulta"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Ezin da deitu "
 
@@ -1852,72 +1846,71 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora muga gainditu du"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ezin izan da konektatu -> %s:%s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Konektatzen -> %s..."
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ezin izan da '%s' ebatzi"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Aldi baterako akatsa '%s' ebaztean"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Ezin da konektatu -> %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Ezin da gako eraztuna eskuratu: '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
+msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
 
-#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/gpgv.cc:198
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr "Beintza sinadura baliogabe bat aurkitu da."
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Ezin izan da %s exekutatu"
+msgstr "Behintzat sinadura baliogabe bat aurkitu da."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr " sinadura egiaztatzeko (gnupg instalaturik al dago?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "Ezin da %s abiarazi  sinadura egiaztatzeko (gnupg instalaturik al dago?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Errore ezezaguna gpgv exekutatzean"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1935,78 +1928,78 @@ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 msgid "Read error from %s process"
 msgstr "Irakurri errorea %s prozesutik"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Goiburuen zain"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
+msgstr "Goiburu lerro bakarra eskuratu da %u karaktereen gainean"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
-msgstr "Okerreko goiburu-lerroa"
+msgstr "Okerreko goiburu lerroa"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
-msgstr "http zerbitzariak erantzun-buru baliogabe bat bidali du."
+msgstr "http zerbitzariak erantzun goiburu baliogabe bat bidali du."
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http zerbitzariak Content-Length buru baliogabe bat bidali du"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http zerbitzariak Content-Range buru baliogabe bat bidali du"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "http zerbitzariak barruti onarpena apurturik du"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
-msgstr "Datu-formatu ezezaguna"
+msgstr "Datu formatu ezezaguna"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
-msgstr "Konexioaren denbora-muga gainditu da"
+msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
-msgstr "Barne-errorea"
+msgstr "Barne errorea"
 
 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
@@ -2025,12 +2018,12 @@ msgstr "%s hautapena ez da aurkitu"
 #: apt-pkg/contrib/configuration.cc:436
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Mota ezezaguneko laburtzapena: '%c'"
+msgstr "Mota ezezaguneko laburpena: '%c'"
 
 #: apt-pkg/contrib/configuration.cc:494
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "%s konfigurazio-fitxategia irekitzen"
+msgstr "%s konfigurazio fitxategia irekitzen"
 
 #: apt-pkg/contrib/configuration.cc:512
 #, c-format
@@ -2040,42 +2033,42 @@ msgstr "%d lerroa luzeegia da (gehienez %d)"
 #: apt-pkg/contrib/configuration.cc:608
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Sintaxi-errorea, %s:%u: Blokearen hasieran ez dago izenik."
+msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik."
 
 #: apt-pkg/contrib/configuration.cc:627
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Sintasi errorea %s:%u: Gaizki eratutako"
+msgstr "Sintaxi errorea %s:%u: Gaizki eratutako"
 
 #: apt-pkg/contrib/configuration.cc:644
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria balioaren ondoren"
+msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren"
 
 #: apt-pkg/contrib/configuration.cc:684
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Sintaxi-errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
+msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
 
 #: apt-pkg/contrib/configuration.cc:691
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Sintaxi-errorea, %s:%u: habiaratutako elementu gehiegi"
+msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi"
 
 #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Sintaxi-errorea, %s:%u: hemendik barne hartuta"
+msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta"
 
 #: apt-pkg/contrib/configuration.cc:704
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Sintaxi-errorea, %s:%u: onartu gabeko '%s' direktiba"
+msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
 
 #: apt-pkg/contrib/configuration.cc:738
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Sintaxi-errorea, %s:%u: Zabor gehigarria fitxategi-amaieran"
+msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran"
 
 #: apt-pkg/contrib/progress.cc:154
 #, c-format
@@ -2090,18 +2083,18 @@ msgstr "%c%s... Eginda"
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ez da ezagutzen komando-lerroko '%c' aukera [%s]."
+msgstr "Ez da ezagutzen komando lerroko '%c' aukera [%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 "Ez da ulertzen komando-lerroko %s aukera"
+msgstr "Ez da ulertzen komando lerroko %s aukera"
 
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Komando-lerroko %s aukera ez da boolearra."
+msgstr "Komando lerroko %s aukera ez da boolearra."
 
 #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
@@ -2111,8 +2104,7 @@ 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
@@ -2137,7 +2129,7 @@ msgstr "Eragiketa baliogabea: %s"
 #: apt-pkg/contrib/cdromutl.cc:55
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "Ezin da atzitu %s muntatze-puntua"
+msgstr "Ezin da atzitu %s muntatze puntua"
 
 #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
 #, c-format
@@ -2151,20 +2143,17 @@ msgstr "Huts egin du CDROMa atzitzean"
 #: apt-pkg/contrib/fileutl.cc:82
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr ""
-"Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo-"
-"fitxategiarentzat"
+msgstr "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo fitxategiarentzat"
 
 #: apt-pkg/contrib/fileutl.cc:87
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "Ezin izan da %s blokeo-fitxategia ireki"
+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
@@ -2299,12 +2288,12 @@ msgstr "Hautagaien bertsioak"
 msgid "Dependency generation"
 msgstr "Dependentzi Sormena"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ezin da %s pakete-fitxategia analizatu (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ezin da %s pakete-fitxategia analizatu (2)"
@@ -2350,9 +2339,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2378,10 +2367,8 @@ 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 ""
@@ -2405,10 +2392,17 @@ msgstr "%spartial zerrenda-direktorioa falta da."
 msgid "Archive directory %spartial is missing."
 msgstr "%spartial artxibo-direktorioa falta da."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "%li fitxategia berreskuratzen %li -fitxategitik (%s falta da)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "%li fitxategia berreskuratzen %li-tik"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2548,11 +2542,15 @@ msgstr "S/I errorea iturburu-cachea gordetzean"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ez dator bat"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Hurrengo gako ID hauentzat ez dago gako publiko eskuragarririk:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2561,7 +2559,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2570,15 +2568,14 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
@@ -2679,8 +2676,7 @@ 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
@@ -2724,14 +2720,15 @@ msgstr "%s kendurik"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
-msgstr "%s konfigurazioaz ezabatzeko prestatzen"
+msgid "Preparing to completely remove %s"
+msgstr "%s guztiz ezabatzeko prestatzen"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
-msgstr "%s konfigurazioaz kentzen"
+msgid "Completely removed %s"
+msgstr "%s guztiz ezabatua"
 
 #: 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 0afdf5879..806b2a924 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-02-15 14:09+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -148,14 +148,14 @@ msgstr "  Versiotaulukko:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s %s käännöksen päiväys %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -521,7 +521,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLinkin yläraja %st saavutettu.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Tiedostolle %s ei toimi stat"
@@ -635,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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"
@@ -716,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -865,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -894,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"
@@ -945,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Luettelokansiota ei voitu lukita"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -995,25 +995,25 @@ msgstr ""
 "Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
 "käytetty vanhoja. "
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1021,7 +1021,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1032,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1042,116 +1042,121 @@ msgstr ""
 "paketti ei lainkaan ole asennettavissa ja olisi tehtävä vikailmoitus\n"
 "tuosta paketista."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Valmis"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1159,7 +1164,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1168,32 +1173,32 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1547,7 +1552,7 @@ msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut"
 msgid "Internal error getting a package name"
 msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Luetaan tiedostoluetteloa"
 
@@ -1594,10 +1599,6 @@ msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
 msgid "The pkg cache must be initialized first"
 msgstr "Pakettivarasto on ensin alustettava"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Luetaan tiedostoluetteloa"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1671,12 +1672,12 @@ msgstr "Tiedostoa ei löydy"
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Komento stat ei toiminut"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
 
@@ -1804,7 +1805,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1827,7 +1828,7 @@ msgstr "Tiedonsiirto ei onnistunut, palvelin ilmoitti \"%s\""
 msgid "Query"
 msgstr "Kysely"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Käynnistys ei onnistu"
 
@@ -1856,71 +1857,71 @@ msgstr "Yhteyden %s avaus ei onnistu: %s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s), yhteys aikakatkaistiin"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Avataan yhteys %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nimeä \"%s\" ei voitu selvittää"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nimeä \"%s\" ei voitu selvittää"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Lukkoa %s ei saada"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1936,76 +1937,76 @@ msgstr "Putkea %s ei voitu avata"
 msgid "Read error from %s process"
 msgstr "Prosessi %s ilmoitti lukuvirheestä"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Odotetaan otsikoita"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Virheellinen otsikkorivi"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-palvelin lähetti virheellisen vastausotsikon"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Length-otsikon"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-palvelin lähetti virheellisen Content-Range-otsikon"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
@@ -2296,12 +2297,12 @@ msgstr "Mahdolliset versiot"
 msgid "Dependency generation"
 msgstr "Luodaan riippuvuudet"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
@@ -2400,11 +2401,18 @@ msgstr "Luettelokansio %spartial puuttuu."
 msgid "Archive directory %spartial is missing."
 msgstr "Arkistokansio %spartial puuttuu."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Luetaan tiedostoluetteloa"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2548,11 +2556,15 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ei täsmää"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2561,7 +2573,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2570,7 +2582,7 @@ msgstr ""
 "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
 "tämän paketin itse."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2578,7 +2590,7 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
@@ -2726,19 +2738,26 @@ msgid "Removed %s"
 msgstr "Suosittelut"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Avataan asetustiedosto %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Tiedoston %s poistaminen ei onnistunut"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
 
+#~ msgid "Reading file list"
+#~ msgstr "Luetaan tiedostoluetteloa"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Lukkoa %s ei saada"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 #~ "Tuntematon toimittajan tunniste \"%s\" rivillä %u lähdeluettelossa %s"
diff --git a/po/fr.po b/po/fr.po
index e1858e330..22d83c0b1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,21 +1,21 @@
 # translation of fr.po to French
 # Advanced Package Transfer - APT message translation catalog
 # French messages
-# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005.
 #
+# Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-11-30 08:56+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-05-18 09:31-0500\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: cmdline/apt-cache.cc:135
@@ -149,14 +149,14 @@ msgstr " Table de version�:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s pour %s %s est compil� le %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -235,11 +235,13 @@ msgstr ""
 
 #: 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��"
+msgstr ""
+"Veuillez indiquer le nom de ce disque, par exemple ��Debian 2.1r1 Disk 1��"
 
 #: cmdline/apt-cdrom.cc:93
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Veuillez ins�rer un disque dans le lecteur et appuyez sur la touche Entr�e"
+msgstr ""
+"Veuillez ins�rer un disque dans le lecteur et appuyez sur la touche Entr�e"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -315,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"
@@ -431,7 +434,8 @@ msgstr "Aucune s�lection ne correspond"
 #: ftparchive/apt-ftparchive.cc:835
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets ��%s��"
+msgstr ""
+"Quelques fichiers sont manquants dans le groupe de fichiers de paquets ��%s��"
 
 #: ftparchive/cachedb.cc:45
 #, c-format
@@ -523,7 +527,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Seuil de delink de %so atteint.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossible de statuer %s"
@@ -637,79 +641,79 @@ msgstr "Probl�me en d�liant %s"
 msgid "Failed to rename %s to %s"
 msgstr "Impossible de changer le nom %s en %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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 d�pendances 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 install�s�:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "Les paquets suivants seront ENLEV�S�:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "Les paquets suivants ont �t� conserv�s�:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc: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 INF�RIEURE�:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "Les paquets retenus suivants seront chang�s�:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc: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!"
@@ -718,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 install�s, "
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu r�install�s, "
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis � une version inf�rieure, "
 
-#: 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 install�s ou enlev�s.\n"
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
 msgid "Correcting dependencies..."
 msgstr "Correction des d�pendances..."
 
-#: 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 d�pendances"
 
-#: 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 probl�mes."
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
 msgid "Unmet dependencies. Try using -f."
 msgstr "D�pendances manquantes. Essayez d'utiliser l'option -f."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ATTENTION�: les paquets suivants n'ont pas �t� authentifi�s."
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc: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 v�rification (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 authentifi�s"
 
-#: 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 probl�mes 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 cass�s."
 
-#: 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 enlev�s mais la d�sinstallation est d�sactiv�e."
+msgstr ""
+"Les paquets doivent �tre enlev�s mais la d�sinstallation est d�sactiv�e."
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc: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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le r�pertoire de t�l�chargement"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 n�cessaire 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 n�cessaire 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 "Apr�s d�paquetage, %so d'espace disque suppl�mentaires seront utilis�s.\n"
+msgstr ""
+"Apr�s d�paquetage, %so d'espace disque suppl�mentaires seront utilis�s.\n"
 
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Apr�s d�paquetage, %so d'espace disque seront lib�r�s.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de d�terminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc: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� indiqu�e mais il ne s'agit pas d'une op�ration "
@@ -856,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"
@@ -871,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de r�cup�rer %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 t�l�charg�s."
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "T�l�chargement achev� et dans le mode t�l�chargement uniquement"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -900,47 +906,48 @@ msgstr ""
 "Impossible de r�cup�rer quelques archives, peut-�tre devrez-vous lancer apt-"
 "get update ou essayer avec --fix-missing�?"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc: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, s�lection 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 d�j� install� et la mise � jour n'est pas pr�vue.\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 s�lectionner 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"
@@ -952,49 +959,50 @@ msgstr ""
 "devenu obsol�te\n"
 "ou qu'il n'est disponible que sur une autre source\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc: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 r�installation de %s est impossible, il ne peut pas �tre t�l�charg�.\n"
+msgstr ""
+"La r�installation de %s est impossible, il ne peut pas �tre t�l�charg�.\n"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s est d�j� la plus r�cente version disponible.\n"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc: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 trouv�e"
 
-#: 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:1311
+#: 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:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Impossible de verrouiller le r�pertoire de liste"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1002,25 +1010,26 @@ msgstr ""
 "Le t�l�chargement de quelques fichiers d'index a �chou�, ils ont �t� "
 "ignor�s, ou les anciens ont �t� utilis�s � la place."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cass� le boulot�!"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, s�lectionne %s pour l'expression rationnelle ��%s��\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr "Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
+msgstr ""
+"Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1028,7 +1037,7 @@ msgstr ""
 "D�pendances non satisfaites. Essayez ��apt-get -f install�� sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1040,7 +1049,7 @@ msgstr ""
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "�t� cr��s ou ne sont pas sortis d'Incoming."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1049,118 +1058,123 @@ msgstr ""
 "Puisque vous n'avez demand� qu'une seule op�ration, le paquet n'est\n"
 "probablement pas installable et vous devriez envoyer un rapport de bogue."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider � r�soudre la situation�: "
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Paquets d�fectueux"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets suppl�mentaires suivants seront install�s�: "
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Paquets sugg�r�s�:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Paquets recommand�s�:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise � jour... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "�chec"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de r�solution du probl�me a cass� certaines "
 "parties"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez sp�cifier au moins un paquet source"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, 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:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saut du t�l�chargement du fichier ��%s��, d�j� t�l�charg�\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "N�cessit� de prendre %so/%so dans les sources.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "N�cessit� de prendre %so dans les sources.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "R�cup�ration des sources %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "�chec lors de la r�cup�ration de quelques archives."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du d�compactage des paquets sources d�j� d�compact�s dans %s\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de d�compactage ��%s�� a �chou�.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez v�rifier si le paquet dpkg-dev est install�.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction ��%s�� a �chou�.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "�chec du processus fils"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut sp�cifier au moins un paquet pour v�rifier les d�pendances de "
 "construction"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les d�pendances de construction pour %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de d�pendance de construction.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1169,7 +1183,7 @@ msgstr ""
 "La d�pendance %s vis-�-vis de %s ne peut �tre satisfaite car le paquet %s ne "
 "peut �tre trouv�"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1178,32 +1192,33 @@ msgstr ""
 "La d�pendance %s vis-�-vis de %s ne peut �tre satisfaite car aucune version "
 "du paquet %s ne peut satisfaire � la version requise"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Impossible de satisfaire la d�pendance %s pour %s�: le paquet install� %s "
 "est trop r�cent"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les d�pendances %s pour %s�: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les d�pendances de compilation pour %s ne peuvent pas �tre satisfaites."
+msgstr ""
+"Les d�pendances de compilation pour %s ne peuvent pas �tre satisfaites."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les d�pendances de construction"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Modules reconnus�:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1376,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 ""
 "pr�c�dant ce message sont importantes. Veuillez les corriger et\n"
 "d�marrer l'[I]nstallation une nouvelle fois."
@@ -1564,7 +1580,7 @@ msgstr "Impossible de changer pour le r�pertoire d'administration %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Erreur interne lors de l'obtention d'un nom de paquet"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lecture de la liste de fichiers"
 
@@ -1611,10 +1627,6 @@ msgstr "Erreur interne en ajoutant une d�viation"
 msgid "The pkg cache must be initialized first"
 msgstr "Le cache des paquets doit �tre initialis� en premier"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lecture de la liste des fichiers"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1638,7 +1650,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
@@ -1689,12 +1702,12 @@ msgstr "Disque non trouv�."
 msgid "File not found"
 msgstr "Fichier non trouv�"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Impossible de statuer"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
 
@@ -1741,7 +1754,8 @@ msgstr ""
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "La commande ��%s�� du script de connexion a �chou�, le serveur a r�pondu�: %s"
+msgstr ""
+"La commande ��%s�� du script de connexion a �chou�, le serveur a r�pondu�: %s"
 
 #: methods/ftp.cc:291
 #, c-format
@@ -1778,7 +1792,8 @@ msgstr "Impossible de cr�er un connecteur"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr "Impossible de se connecter sur le port de donn�es, d�lai de connexion d�pass�"
+msgstr ""
+"Impossible de se connecter sur le port de donn�es, d�lai de connexion d�pass�"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
@@ -1822,7 +1837,7 @@ msgstr "D�lai de connexion au port de donn�es d�pass�"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probl�me de hachage du fichier"
 
@@ -1845,7 +1860,7 @@ msgstr "Le transfert de donn�es a �chou�, le serveur a r�pondu ��%s��"
 msgid "Query"
 msgstr "Requ�te"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Impossible d'invoquer "
 
@@ -1874,72 +1889,77 @@ msgstr "Impossible d'initialiser la connexion � %s:�%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Connexion � %s:�%s (%s) impossible, d�lai de connexion d�pass�"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Connexion � %s:�%s (%s) impossible."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion � %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ne parvient pas � r�soudre ��%s��"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Erreur temporaire de r�solution de ��%s��"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 "Quelque chose d'impr�visible est survenu lors de la d�termination de ��%s:%"
 "s�� (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Impossible de se connecter � %s %s�:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Impossible d'acc�der au porte-cl�s�:���%s��"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste de param�tres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr ""
+"E: liste de param�tres trop longue pour Acquire::gpgv::Options. Abandon."
 
-#: methods/gpgv.cc:191
-msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interne�: signature correcte, mais il est impossible de d�terminer "
 "l'empreinte de la cl�."
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "Au moins une signature non valable a �t� rencontr�e."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Impossible d'ex�cuter "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr "pour contr�ler la signature (veuillez v�rifier si gnupg est install�)."
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"Impossible d'ex�cuter ��%s�� pour contr�ler la signature\n"
+"(veuillez v�rifier si gnupg est install�)."
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Erreur inconnue � l'ex�cution de gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "Les signatures suivantes ne sont pas valables�:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1957,76 +1977,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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Attente des fichiers d'en-t�te"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "J'ai une simple ligne d'en-t�te au-dessus du caract�re %u"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Mauvaise ligne d'en-t�te"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Le serveur http a envoy� une r�ponse dont l'en-t�te est invalide"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Le serveur http a envoy� un en-t�te ��Content-Length�� invalide"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Le serveur http a envoy� un en-t�te ��Content-Range�� invalide"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Ce serveur http poss�de un support des limites non-valide"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "S�lection d�faillante"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "D�lai de connexion d�pass�"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Erreur d'�criture du fichier de sortie"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Erreur d'�criture sur un fichier"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Erreur d'�criture sur le fichier"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erreur de lecture depuis le serveur distant et cl�ture de la connexion"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Mauvais en-t�te de donn�e"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "�chec de la connexion"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -2319,12 +2339,12 @@ msgstr "Versions possibles"
 msgid "Dependency generation"
 msgstr "G�n�ration des d�pendances"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Impossible de traiter le fichier %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossible de traiter le fichier %s (2)"
@@ -2347,12 +2367,14 @@ msgstr "Ligne %lu mal form�e dans la liste des sources %s (analyse de l'URI)"
 #: apt-pkg/sourcelist.cc:105
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Ligne %lu mal form�e dans la liste des sources %s (distribution absolue)"
+msgstr ""
+"Ligne %lu mal form�e dans la liste des sources %s (distribution absolue)"
 
 #: apt-pkg/sourcelist.cc:112
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Ligne %lu mal form�e dans la liste des sources %s (analyse de distribution)"
+msgstr ""
+"Ligne %lu mal form�e dans la liste des sources %s (analyse de distribution)"
 
 #: apt-pkg/sourcelist.cc:203
 #, c-format
@@ -2372,12 +2394,14 @@ msgstr "Ligne %u mal form�e dans la liste des sources %s (type)"
 #: 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:252 apt-pkg/sourcelist.cc:255
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Ligne %u mal form�e dans la liste des sources %s (identifiant du fournisseur)"
+msgstr ""
+"Ligne %u mal form�e dans la liste des sources %s (identifiant du fournisseur)"
 
 #: apt-pkg/packagemanager.cc:402
 #, c-format
@@ -2398,7 +2422,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 r�install�, mais je ne parviens pas � trouver son "
 "archive."
@@ -2427,11 +2452,18 @@ msgstr "Le r�pertoire %spartial pour les listes n'existe pas."
 msgid "Archive directory %spartial is missing."
 msgstr "Le r�pertoire d'archive %spartial n'existe pas."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "T�l�chargement du fichier %li de %li (%s restant)"
 
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "T�l�chargement du fichier %li de %li"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2465,7 +2497,8 @@ msgstr "Impossible de localiser %s."
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Vous devez ins�rer quelques adresses ��sources�� dans votre sources.list"
+msgstr ""
+"Vous devez ins�rer quelques adresses ��sources�� dans votre sources.list"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
@@ -2539,7 +2572,8 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:210
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Vous avez d�pass� le nombre de versions que cet APT est capable de traiter."
+msgstr ""
+"Vous avez d�pass� le nombre de versions que cet APT est capable de traiter."
 
 #: apt-pkg/pkgcachegen.cc:213
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2575,18 +2609,24 @@ msgstr "Assemblage des fichiers list�s dans les champs Provides"
 
 #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 msgid "IO Error saving source cache"
-msgstr "Erreur d'entr�e/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr ""
+"Erreur d'entr�e/sortie lors de la sauvegarde du fichier de cache des sources"
 
 #: apt-pkg/acquire-item.cc:126
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "impossible de changer le nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Somme de contr�le MD5 incoh�rente"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Aucune cl� publique n'est disponible pour la/les cl�(s) suivante(s)�:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2596,7 +2636,7 @@ msgstr ""
 "sans doute que vous devrez corriger ce paquet manuellement (absence "
 "d'architecture)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2605,14 +2645,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:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Taille incoh�rente"
 
@@ -2759,15 +2800,14 @@ msgstr "%s supprim�"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Pr�paration de la purge de %s"
+msgid "Preparing to completely remove %s"
+msgstr "Pr�paration de la suppression compl�te de %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
-msgstr "%s purg�"
+msgid "Completely removed %s"
+msgstr "%s compl�tement supprim�"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connexion ferm�e pr�matur�ment"
-
diff --git a/po/gl.po b/po/gl.po
index 85ad0f5f3..a288bd8be 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-25 18:41+0200\n"
-"PO-Revision-Date: 2005-11-09 01:49+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-05-11 18:09+0200\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: cmdline/apt-cache.cc:135
-#, c-format
+#, c-format 
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
 
@@ -147,14 +147,14 @@ msgstr "  Táboa de versións:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2356 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s para %s %s compilado en %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -523,7 +523,7 @@ msgid " DeLink limit of %sB hit.\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
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Non se atopou %s"
@@ -637,79 +637,79 @@ msgstr "Problema ao borrar %s"
 msgid "Failed to rename %s to %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:1517
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %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 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"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
 #, c-format
 msgid "but %s is to be installed"
 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"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
 msgid "but it is a virtual package"
 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"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not going to be installed"
 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 "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 hanse ELIMINAR:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "Os seguintes paquetes consérvanse:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "Os seguintes paquetes hanse actualizar:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 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 "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 (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!"
@@ -717,144 +717,144 @@ 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 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 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 ou eliminados de todo.\n"
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
 msgid "Correcting dependencies..."
 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 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 xogo de actualizacións"
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
 msgid " Done"
 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 "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 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 poden autenticar os seguintes paquetes!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
 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 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 "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 "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 "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 "Hai que eliminar paquetes pero a eliminación está desactivada."
 
-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1811 cmdline/apt-get.cc:1844
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1892 cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 "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 "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 "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 "Despois de desempaquetar hanse liberar %sB de disco.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1958
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, c-format
 msgid "Couldn't determine free space in %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 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 \"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 "¡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"
@@ -865,28 +865,28 @@ msgstr ""
 "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 "Abortar."
 
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 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?"
@@ -894,49 +894,49 @@ msgstr ""
 "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 ""
 "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 puido corrixir os paquetes non dispoñibles."
 
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
 msgid "Aborting install."
 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, 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 "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, 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 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 "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"
@@ -947,49 +947,49 @@ msgstr ""
 "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 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 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 "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 é 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 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 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 "Escolleuse a versión %s (%s) de %s\n"
 
-#: cmdline/apt-get.cc:1315
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "A orde \"update\" non toma argumentos"
 
-#: cmdline/apt-get.cc:1328 cmdline/apt-get.cc:1422
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Non se puido bloquear o directorio de listas"
 
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -997,25 +997,25 @@ msgstr ""
 "Non se puido descargar algúns ficheiros de índices; ignoráronse ou "
 "empregáronse uns vellos no seu lugar."
 
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 
-#: cmdline/apt-get.cc:1504 cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non se puido atopar o paquete %s"
 
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
 
-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
 
-#: cmdline/apt-get.cc:1560
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1023,7 +1023,7 @@ msgstr ""
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 
-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1034,7 +1034,7 @@ msgstr ""
 "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:1580
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1043,117 +1043,122 @@ msgstr ""
 "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:1585
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a resolver a situación:"
 
-#: cmdline/apt-get.cc:1588
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1614
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:1685
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 
-#: cmdline/apt-get.cc:1686
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:1706
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 
-#: cmdline/apt-get.cc:1709 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:1714
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Rematado"
 
-#: cmdline/apt-get.cc:1779 cmdline/apt-get.cc:1787
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 
-#: cmdline/apt-get.cc:1887
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle descargar o código fonte"
 
-#: cmdline/apt-get.cc:1914 cmdline/apt-get.cc:2122
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non se puido atopar un paquete fonte para %s"
 
-#: cmdline/apt-get.cc:1961
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre de abondo en %s"
 
-#: cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:1969
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 
-#: cmdline/apt-get.cc:2034
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:2046
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
 
-#: cmdline/apt-get.cc:2064
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 
-#: cmdline/apt-get.cc:2083
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2099
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
 "de compilación"
 
-#: cmdline/apt-get.cc:2127
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non se puido obter a información de dependencias de compilación de %s"
 
-#: cmdline/apt-get.cc:2147
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:2199
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1162,7 +1167,7 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 
-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1171,32 +1176,32 @@ msgstr ""
 "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:2286
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
 "novo de máis"
 
-#: cmdline/apt-get.cc:2311
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
 
-#: cmdline/apt-get.cc:2329
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 
-#: cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2402
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1452,7 +1457,7 @@ msgstr "Ficheiro de configuración %s/%s duplicado"
 msgid "Failed to write file %s"
 msgstr "Non se puido gravar o 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 "Non se puido pechar o ficheiro %s"
@@ -1505,7 +1510,8 @@ msgid "File %s/%s overwrites the one in the package %s"
 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
+#: 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 pode ler %s"
@@ -1552,7 +1558,7 @@ msgstr "Non se puido cambiar ao directorio de administración %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Erro interno ao obter un nome de paquete"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "A ler a lista de ficheiros"
 
@@ -1598,10 +1604,6 @@ msgstr "Erro interno ao engadir un desvío"
 msgid "The pkg cache must be initialized first"
 msgstr "Ten que se inicializar a caché de paquetes primeiro"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "A ler a lista de paquetes"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1674,12 +1676,12 @@ msgstr "Non se atopou o disco"
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Non se atopou"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Non se puido estabrecer a hora de modificación"
 
@@ -1808,7 +1810,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
 msgid "Unable to accept connection"
 msgstr "Non se pode aceptar a conexión"
 
-#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1831,7 +1833,7 @@ msgstr "A transferencia de datos fallou, o servidor dixo \"%s\""
 msgid "Query"
 msgstr "Petición"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Non se puido chamar a "
 
@@ -1860,72 +1862,75 @@ msgstr "Non se pode iniciar a conexión a %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Non se puido conectar a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "A conectar a %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Non se puido resolver \"%s\""
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal ao resolver \"%s\""
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Non se pode conectar a %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Non se puido acceder ao chaveiro: \"%s\""
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non se puido determinar a pegada "
 "dixital da chave"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse alomenos unha sinatura non válida."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Non se puido executar "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr " para verificar a sinatura (¿está gnupg instalado?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+"Non se puido executar \"%s\" para verificar a sinatura (¿está gnupg "
+"instalado?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Erro descoñecido ao executar gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran válidas:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1943,76 +1948,76 @@ msgstr "Non se puido abrir unha canle para %s"
 msgid "Read error from %s process"
 msgstr "Erro de lectura do proceso %s"
 
-#: methods/http.cc:344
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "A agardar polas cabeceiras"
 
-#: methods/http.cc:490
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres"
 
-#: methods/http.cc:498
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Liña de cabeceira incorrecta"
 
-#: methods/http.cc:517 methods/http.cc:524
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida"
 
-#: methods/http.cc:553
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida"
 
-#: methods/http.cc:568
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida"
 
-#: methods/http.cc:570
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor HTTP ten un soporte de rangos roto"
 
-#: methods/http.cc:594
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Formato de data descoñecido"
 
-#: methods/http.cc:741
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:746
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:769
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Erro ao escribir no ficheiro de saída"
 
-#: methods/http.cc:797
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Erro ao escribir nun ficheiro"
 
-#: methods/http.cc:822
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Erro ao escribir no ficheiro"
 
-#: methods/http.cc:836
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
 
-#: methods/http.cc:838
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:1069
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1086
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "A conexión fallou"
 
-#: methods/http.cc:1177
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2025,7 +2030,7 @@ msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
 msgid "Couldn't make mmap of %lu bytes"
 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 "Non se atopou a selección %s"
@@ -2147,7 +2152,7 @@ msgstr "Operación %s non válida"
 msgid "Unable to stat the mount point %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
+#: 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 pode cambiar a %s"
@@ -2304,62 +2309,62 @@ msgstr "Versións candidatas"
 msgid "Dependency generation"
 msgstr "Xeración de dependencias"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Non se pode analizar o ficheiro de paquetes %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 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 "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 "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 "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 "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 "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 "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 "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 "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 "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 "Liña %u mal formada na lista de fontes %s (id de provedor)"
@@ -2409,10 +2414,17 @@ msgstr "O directorio de listas %spartial falla."
 msgid "Archive directory %spartial is missing."
 msgstr "O directorio de arquivos %spartial falla."
 
-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "A obter o ficheiro %li de %li (fallan %s)"
+
+#: apt-pkg/acquire.cc:825
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr "A descargar o ficheiro %li de %li (fallan %s)"
+msgid "Retrieving file %li of %li"
+msgstr "A obter o ficheiro %li de %li"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2429,12 +2441,12 @@ msgstr "O método %s non se iniciou correctamente"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 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 "O sistema de empaquetamento \"%s\" non está soportado"
 
-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:136
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Non se puido determinar un tipo de sistema de empaquetamento axeitado"
 
@@ -2556,11 +2568,16 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
 msgid "rename failed, %s (%s -> %s)."
 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:945
 msgid "MD5Sum mismatch"
 msgstr "Os MD5Sum non coinciden"
 
-#: apt-pkg/acquire-item.cc:722
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2569,7 +2586,7 @@ 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:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2578,7 +2595,7 @@ 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:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2586,7 +2603,7 @@ 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:935
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
@@ -2734,14 +2751,26 @@ msgstr "Eliminouse %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
-msgstr "A se preparar para a eliminación con config %s"
+msgid "Preparing to completely remove %s"
+msgstr "A se preparar para eliminar %s completamente"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
-msgstr "Eliminouse con config %s"
+msgid "Completely removed %s"
+msgstr "Eliminouse %s completamente"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
+
+#~ msgid "Reading file list"
+#~ msgstr "A ler a lista de paquetes"
+
+#~ msgid "Could not execute "
+#~ msgstr "Non se puido executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "A se preparar para a eliminación con config %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Eliminouse con config %s"
diff --git a/po/he.po b/po/he.po
index 494900c05..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-11-30 08:37+0100\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:2352 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"
@@ -531,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:1513
+#: 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"
@@ -612,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:1807 cmdline/apt-get.cc:1840
+#: 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:1888 cmdline/apt-get.cc:2100
+#: 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:1954
+#: 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"
@@ -757,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:1363 cmdline/apt-get.cc:1997
+#: 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:2006
+#: 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"
@@ -833,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1525
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1555
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1556
+#: 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:1568
+#: 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"
@@ -913,159 +913,164 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1576
+#: 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:1581
+#: cmdline/apt-get.cc:1583
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1586
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1612
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1683
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1684
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1704
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1705 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:1710
+#: cmdline/apt-get.cc:1712
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "שגיאה פנימית, כלשון ביצירת %s"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1885
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: 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:1957
+#: 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:1962
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1991
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1997
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2028
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2056
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2068
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2069
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2086
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2105
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2121
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2149
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2169
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2195
+#: 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:2247
+#: 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:2282
+#: 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:2307
+#: cmdline/apt-get.cc:2333
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2347
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2351
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2383
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2424
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
diff --git a/po/hu.po b/po/hu.po
index 5a07e14b5..867c75ef2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,21 +1,21 @@
-# Advanced Package Transfer - APT message translation catalog
-# Hungarian messages
-# PASZTOR Gyorgy <pasztor@linux.gyakg.u-szeged.hu>, 2002.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005.
-#
+# Advanced Package Transfer - APT message translation catalog
+# Hungarian messages
+# PASZTOR Gyorgy <pasztor@linux.gyakg.u-szeged.hu>, 2002.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-02-15 18:03+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-04-30 06:14+0100\n"
+"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
-"Plural-Forms:  nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: cmdline/apt-cache.cc:135
 #, c-format
@@ -27,7 +27,7 @@ msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n"
 #: cmdline/apt-cache.cc:1508
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "%s csomag nem található"
+msgstr "Az alábbi csomag nem található: %s"
 
 #: cmdline/apt-cache.cc:232
 msgid "Total package names : "
@@ -149,14 +149,14 @@ msgstr "  Verziótáblázat:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s ehhez: %s %s fordítás ideje: %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -232,19 +232,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Adj egy nevet e lemezhez, mint például 'Debian 2.1r1 Disk 1'"
 
 #: 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"
+msgstr "Tégy be egy lemezt a meghajtóba és üss enter-t"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Ismételd meg e folyamatot készleted többi CD-jével is."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -485,7 +481,7 @@ msgstr "H: Hibás a fájl "
 #: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "Nem sikerült feloldani a következőt: %s"
+msgstr "Nem sikerült feloldani ezt: %s"
 
 #: ftparchive/writer.cc:163
 msgid "Tree walking failed"
@@ -522,7 +518,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink elérte %sB korlátját.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s elérése sikertelen"
@@ -629,392 +625,388 @@ msgstr "Olvasási hiba az MD5 kiszámításakor"
 #: ftparchive/multicompress.cc:475
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "Probléma %s unlinkelésekor"
+msgstr "Hiba %s elláncolásakor"
 
 #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "Nem sikerült átnevezni a következőt: %s erre: %s"
+msgstr "Nem sikerült átnevezni %s-t erre: %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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:"
+msgstr "Az alábbi 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:"
+msgstr "Az alábbi Ú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:"
+msgstr "Az alábbi 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:"
+msgstr "Az alábbi 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:"
+msgstr "Az alábbi 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:"
+msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:"
 
-#: 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:"
+msgstr "Az alábbi visszafogott csomagokat cserélem:"
 
-#: 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
-#, 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 ""
-"FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n"
-"Ezt nem kellene megtenni, kivéve ha pontosan tudod mit csinálsz!"
+"FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n"
+"NE tedd ezt, míg nem tudod pontosan, mit csinálsz!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, "
+msgstr "%lu frissített, %lu újonnan telepített, "
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu újra lesz telepítve, "
+msgstr "%lu újratelepítendő, "
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu vissza lesz fejlesztve, "
+msgstr "%lu kerül öregbítésre, "
 
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc: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"
+msgstr "%lu eltávolítandó és %lu nem frissített.\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"
+msgstr "%lu nincs teljesen telepítve/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!"
+msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "A hitelesítési figyelmeztetést átléptem.\n"
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:700
 msgid "Install these packages without verification [y/N]? "
-msgstr "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? "
+msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (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 ""
+msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!"
 
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
-msgstr "Belső hiba egy eltérítés hozzáadásakor"
+msgstr "Belső hiba, a rendezés nem zárult"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 ""
+msgstr "Ez durva... A méretek nem egyeznek, írj ide: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 "Az archívumokból %sB/%sB-t kell letölteni.\n"
+msgstr "Letöltendő az archívumokból: %sB/%sB\n"
 
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "%sB-t kell letölteni az archívumokból.\n"
+msgstr "Letöltés az archívumokból: %sB\n"
 
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc: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"
+msgstr "Kicsomagolás után %sB lemezterületet használok fel\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"
+msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Nincs elég szabad hely itt: %s"
+msgstr "Nem határozható meg a szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "Nincs elég szabad hely itt: %s."
+msgstr "Nincs elég szabad hely itt:  %s."
 
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc: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
-#, 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 ""
-"Ártalmasnak tűnő műveletet készülsz végrehajtani\n"
-"A folytatáshoz írd be a következő kifejezést '%s'\n"
+"Ártalmasnak tűnő műveletet készülsz végrehajtani.\n"
+"A folytatáshoz írd be ezt: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "Nem sikerült letölteni a következőt: %s  %s\n"
+msgstr "Sikertelen letöltés: %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc: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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
 msgstr ""
-"Nem lehet letölteni néhány archívot, talán próbáld az apt-get update -et "
-"vagy a --fix-missing -et."
+"Nem lehet letölteni néhány archívumot.\n"
+" Próbáld ki az apt-get update -et vagy a --fix-missing -et."
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing és a média csere még nem támogatott"
+msgstr "--fix-missing és média csere jelenleg nem támogatott"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc: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"
+msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
 
-#: cmdline/apt-get.cc:1067
+#: cmdline/apt-get.cc: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"
+msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\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."
+msgstr "Egyet név szerint ki kell jelölnöd a 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"
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"A(z) %s csomagnak nincs elérhető verziója, de egy másik csomag\n"
-"hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n"
-"vagy csak más forrásból érhető el\n"
+"%s csomag nem elérhető, de egy másikhivatkozik rá\n"
+".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
-msgstr "Azonban a következő csomagok felváltják:"
+msgstr "De az alábbi csomagok felváltják:"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "Package %s has no installation candidate"
-msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez"
+msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
 
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc: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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Nem tudom a listakönyvtárat zárolni"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a "
-"régi változatuk lesz használva."
+"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi "
+"változatukat használom."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, AllUpgrade megsértett valamit"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "Nem található a(z) %s csomag"
+msgstr "Az alábbi csomag nem található: %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :"
+msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1022,7 +1014,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:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1034,7 +1026,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1044,118 +1036,122 @@ msgstr ""
 "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n"
 "kitölteni a csomaghoz."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
-msgstr "A következő információ talán segít megoldani a helyzetet:"
+msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
-msgstr "A következő extra csomagok kerülnek telepítésre:"
+msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Kész"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Belső hiba, AllUpgrade megsértett valamit"
+msgstr "Belső hiba, hibafeloldó gond"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "A már letöltött '%s' fájl kihagyása\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elég szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB forrásarchívumot kell letölteni.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s' elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, 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:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1160,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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1169,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1366,8 +1362,7 @@ msgstr "vagy hiányzó függőségek miatti hibákat. Ez így OK, csak az ezen �
 #: dselect/install:103
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"előtti hibák fontosak. Kérem javítsa azokat és futtassa az [I]nstallt újra"
+msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1400,11 +1395,11 @@ msgstr "Érvénytelen archívum-aláírás"
 
 #: apt-inst/contrib/arfile.cc:81
 msgid "Error reading archive member header"
-msgstr "Hiba az archívtag-fejléc olvasásakor"
+msgstr "Hiba az archívum tag fejléc olvasásakor"
 
 #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
 msgid "Invalid archive member header"
-msgstr "Érvénytelen archívtag-fejléc"
+msgstr "Érvénytelen archívum tag fejléc"
 
 #: apt-inst/contrib/arfile.cc:131
 msgid "Archive is too short"
@@ -1416,7 +1411,7 @@ msgstr "Nem sikerült olvasni az archívum fejléceket"
 
 #: apt-inst/filelist.cc:384
 msgid "DropNode called on still linked node"
-msgstr "DropNode hívása egy még mindig kapcsolódó node-ra történt"
+msgstr "DropNode hívása egy még mindig láncolt node-ra történt"
 
 #: apt-inst/filelist.cc:416
 msgid "Failed to locate the hash element!"
@@ -1446,9 +1441,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Dupla %s/%s konfigurációs fájl"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
-msgstr "Nem sikerült a(z) %s fájlba írni"
+msgstr "%s fájl írása sikertelen"
 
 #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1507,7 +1502,7 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt"
 #: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"
-msgstr "A(z) %s nem olvasható"
+msgstr "%s nem olvasható"
 
 #: apt-inst/extract.cc:494
 #, c-format
@@ -1550,7 +1545,7 @@ msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani"
 msgid "Internal error getting a package name"
 msgstr "Belső hiba a csomagnév elhozásakor"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Fájllista olvasása"
 
@@ -1597,19 +1592,15 @@ msgstr "Belső hiba egy eltérítés hozzáadásakor"
 msgid "The pkg cache must be initialized first"
 msgstr "A csomag gyorsítótárnak előbb kell inicializálva lennie"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Fájllista olvasása"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr "Nem sikerült megtalálni a csomag-fejlécet, offszet %lu"
+msgstr "Nem találom a csomag-fejlécet, offszet %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Hibás ConfFile szekció a státusz fájlban. Offszet %lu"
+msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu"
 
 #: apt-inst/deb/dpkgdb.cc:470
 #, c-format
@@ -1624,8 +1615,7 @@ msgstr "Ez nem egy érvényes DEB archív, hiányzik a '%s' tag"
 #: apt-inst/deb/debfile.cc:52
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Ez nem egy érvényes DEB archív, hiányzik a(z) \"%s\" vagy a(z) \"%s\" tag"
+msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
@@ -1664,27 +1654,24 @@ msgstr "Hibás CD"
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Nem lehet leválasztani a(z) %s meghajtóban levő CD-ROM-ot, talán még "
-"használod."
+msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Nem találom a fájlt"
+msgstr "Nem találom a lemezt"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Nem találom a fájlt"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Nem érhető el"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
-msgstr "Nem sikerült beállítani a módosítási időt"
+msgstr "A módosítási időt beállítása sikertelen"
 
 #: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
@@ -1693,7 +1680,7 @@ msgstr "Érvénytelen URI, helyi URIk nem kezdődhetnek //-el"
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:162
 msgid "Logging in"
-msgstr "Belépés"
+msgstr "Bejelentkezés a kiszolgálóra:"
 
 #: methods/ftp.cc:168
 msgid "Unable to determine the peer name"
@@ -1706,17 +1693,17 @@ msgstr "Nem lehet a helyi nevet megállapítani"
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "A kiszolgáló visszautasította a kapcsolatot, és azt mondta: %s"
+msgstr "A kiszolgáló megtagadta a kapcsolatot: %s"
 
 #: methods/ftp.cc:210
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "Hibás USER, a kiszolgáló azt mondta: %s"
+msgstr "Hibás USER, a kiszolgáló üzenete: %s"
 
 #: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "Hibás PASS, a kiszolgáló azt mondta: %s"
+msgstr "Hibás PASS, a kiszolgáló üzenete: %s"
 
 #: methods/ftp.cc:237
 msgid ""
@@ -1729,12 +1716,12 @@ msgstr ""
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló azt mondta: %s"
+msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló üzenete: %s"
 
 #: methods/ftp.cc:291
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "Hibás TYPE, a kiszolgáló azt mondta: %s"
+msgstr "Hibás TYPE, a kiszolgáló üzenete: %s"
 
 #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
@@ -1766,8 +1753,7 @@ msgstr "Nem lehet létrehozni a socket-et"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időkeretet"
+msgstr "Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időt"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
@@ -1801,24 +1787,24 @@ msgstr "Ismeretlen a(z) %u címcsalád (AF_*)"
 #: methods/ftp.cc:798
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "Hibás EPRT, a kiszolgáló azt mondta: %s"
+msgstr "Hibás EPRT, a kiszolgáló üzenete: %s"
 
 #: methods/ftp.cc:818
 msgid "Data socket connect timed out"
-msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
+msgstr "Az adat sockethez kapcsolódás túllépte az időt"
 
 #: methods/ftp.cc:825
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "Nem lehet letölteni a fájlt, a kiszolgáló azt mondta '%s'"
+msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'"
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
@@ -1827,21 +1813,21 @@ msgstr "Az adat socket túllépte az időt"
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "Adatátvitel sikertelen, a kiszolgáló azt mondta '%s'"
+msgstr "Adatátvitel sikertelen, a kiszolgáló üzenete: '%s'"
 
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
 msgstr "Lekérdezés"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Nem lehet meghívni "
 
 #: methods/connect.cc:64
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "Csatlakozás a következőhöz: %s (%s)"
+msgstr "Csatlakozás: %s (%s)"
 
 #: methods/connect.cc:71
 #, c-format
@@ -1851,87 +1837,87 @@ msgstr "[IP: %s %s]"
 #: methods/connect.cc:80
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "socket létrehozása sikertelen a következőhöz: %s (f=%u t=%u p=%u)"
+msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)"
 
 #: methods/connect.cc:86
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Kapcsolat létrehozása sikertelen a következőhöz: %s: %s (%s)."
+msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)."
 
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "Nem lehet kapcsolódni a következőhöz: %s: %s (%s)."
+msgstr "Nem lehet ehhez: %s: %s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
-msgstr "Kapcsolódás a következőhöz: %s"
+msgstr "Kapcsolódás: %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nem lehet feloldani a következőt: '%s' "
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Átmeneti hiba '%s' feloldása közben"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
-msgstr "Nem lehet kapcsolódni következőhöz: %s %s:"
+msgstr "Sikertelen kapcsolódás ide: %s %s:"
+
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nem lehet feloldani a következőt: '%s' "
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "1 vagy több érvénytelen aláírást találtam."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nem sikerült zárolni: %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " az aláírás igazolásához (a gnupg telepítve van?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Ismeretlen gpgv futtatási hiba"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "A következő extra csomagok kerülnek telepítésre:"
+msgstr "Az alábbi aláírások érvénytelenek voltak:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1943,80 +1929,80 @@ 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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Várakozás a fejlécekre"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Rossz fejléc sor"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "A http kiszolgáló egy érvénytelen Content-Length fejlécet küldött"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "A http kiszolgáló egy érvénytelen Content-Range fejlécet küldött"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Ez a http szerver támogatja a sérült tartományokat "
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Ismeretlen dátum formátum"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Sikertelen kiválasztás"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Hiba fájl írásakor"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
-msgstr "Kapcsolódás sikertelen"
+msgstr "Sikertelen kapcsolódás"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Belső hiba"
 
-# FIXME
+# FIXME
 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
 msgstr "Nem lehet mmap-olni egy üres fájlt"
@@ -2131,7 +2117,7 @@ msgstr "%s opció egész és nem %s típusú argumentumot követel meg"
 #: apt-pkg/contrib/cmndline.cc:268
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "A(z) %s opció túl hosszú"
+msgstr "Túl hosszú %s opció"
 
 #: apt-pkg/contrib/cmndline.cc:301
 #, c-format
@@ -2146,12 +2132,12 @@ msgstr "%s érvénytelen művelet"
 #: apt-pkg/contrib/cdromutl.cc:55
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "%s csatlakoztatási pont nem érhető el"
+msgstr "%s csatolási pont nem érhető el"
 
 #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"
-msgstr "Nem sikerült a következőre váltani: %s"
+msgstr "Nem sikerült ide váltani: %s"
 
 #: apt-pkg/contrib/cdromutl.cc:190
 msgid "Failed to stat the cdrom"
@@ -2214,15 +2200,15 @@ msgstr "írás, még kiírandó %lu de ez nem lehetséges"
 
 #: apt-pkg/contrib/fileutl.cc:597
 msgid "Problem closing the file"
-msgstr "Probléma a fájl bezárásakor"
+msgstr "Hiba a fájl bezárásakor"
 
 #: apt-pkg/contrib/fileutl.cc:603
 msgid "Problem unlinking the file"
-msgstr "Probléma a fájl unlinkelésével"
+msgstr "Hiba a fájl leválasztásával"
 
 #: apt-pkg/contrib/fileutl.cc:614
 msgid "Problem syncing the file"
-msgstr "Probléma a fájl szinkronizálásakor"
+msgstr "Hiba a fájl szinkronizálásakor"
 
 #: apt-pkg/pkgcache.cc:126
 msgid "Empty package cache"
@@ -2303,14 +2289,14 @@ msgstr "Lehetséges verziók"
 
 #: apt-pkg/depcache.cc:90
 msgid "Dependency generation"
-msgstr "Függőséggenerálás"
+msgstr "Függőség-generálás"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)"
@@ -2356,9 +2342,9 @@ 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:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
+msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2385,21 +2371,21 @@ msgstr "A(z) '%s' indexfájltípus nem támogatott"
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "A(z) %s csomagot újra kell telepíteni, de nem találok hozzá archívot."
+msgstr ""
+"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá."
 
 #: apt-pkg/algorithms.cc:1059
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"Hiba, pkgProblemResolver::Resolve sérüléseket generált, ezt visszatartott "
+"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott "
 "csomagok okozhatják."
 
 #: apt-pkg/algorithms.cc:1061
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
-"A problémák nem javíthatók, sérült visszatartott csomagok vannak a "
-"rendszeren."
+"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren."
 
 #: apt-pkg/acquire.cc:62
 #, c-format
@@ -2411,10 +2397,17 @@ msgstr "%spartial listakönyvtár hiányzik."
 msgid "Archive directory %spartial is missing."
 msgstr "%spartial archívumkönyvtár hiányzik."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Fájlletöltés: %li/%li (%s van hátra)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Fájllista olvasása"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2427,12 +2420,9 @@ msgid "Method %s did not start correctly"
 msgstr "A(z) %s metódus nem indult el helyesen"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Kérlek tedd be a(z)\n"
-"  %s\n"
-"címkéjű lemezt a(z) %s meghajtóba és üss entert\n"
+msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert"
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2441,7 +2431,7 @@ msgstr "A(z) '%s' csomagrendszer nem támogatott"
 
 #: apt-pkg/init.cc:136
 msgid "Unable to determine a suitable packaging system type"
-msgstr "A megfelelő csomagrendszer típusa nem határozható meg"
+msgstr "A megfelelő csomagrendszer típus nem határozható meg"
 
 #: apt-pkg/clean.cc:61
 #, c-format
@@ -2450,7 +2440,7 @@ msgstr "%s nem érhető el."
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Néhány 'source' URI-t bele kell tenned a sources.list fájlodba"
+msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
@@ -2459,8 +2449,7 @@ msgstr ""
 
 #: apt-pkg/cachefile.cc:77
 msgid "You may want to run apt-get update to correct these problems"
-msgstr ""
-"Próbáld futtatni az apt-get update -et, hogy javítsd ezeket a problémákat"
+msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat"
 
 #: apt-pkg/policy.cc:269
 msgid "Invalid record in the preferences file, no Package header"
@@ -2482,37 +2471,37 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van"
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)"
+msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)"
+msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)"
+msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)"
+msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)"
+msgstr "Hiba történt %s feldolgozásakor (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)"
+msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)"
+msgstr "Hiba történt %s feldolgozásakor (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2532,12 +2521,12 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)"
+msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)"
+msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
@@ -2550,7 +2539,7 @@ msgstr ""
 msgid "Couldn't stat source package list %s"
 msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
 
-# FIXME
+# FIXME
 #: apt-pkg/pkgcachegen.cc:658
 msgid "Collecting File Provides"
 msgstr "\"Előkészít\" kapcsolatok összegyűjtése"
@@ -2564,36 +2553,40 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "sikertelen átnevezés, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Az MD5Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
+"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot. (hiányzó arch. miatt)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg "
+"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
@@ -2608,8 +2601,8 @@ msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"%s CD-ROM csatlakoztatási pont használata\n"
-"CD-ROM csatlakoztatása\n"
+"%s CD-ROM csatolási pont használata\n"
+"CD-ROM csatolása\n"
 
 #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
 msgid "Identifying.. "
@@ -2623,7 +2616,7 @@ msgstr "Tárolt címke: %s \n"
 #: apt-pkg/cdrom.cc:561
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "%s CD-ROM csatlakoztatási pont használata\n"
+msgstr "%s CD-ROM csatolási pont használata\n"
 
 #: apt-pkg/cdrom.cc:579
 msgid "Unmounting CD-ROM\n"
@@ -2636,20 +2629,22 @@ msgstr "Várakozás a lemezre...\n"
 #. Mount the new CDROM
 #: apt-pkg/cdrom.cc:591
 msgid "Mounting CD-ROM...\n"
-msgstr "CD-ROM csatlakoztatása...\n"
+msgstr "CD-ROM felcsatolása...\n"
 
 #: apt-pkg/cdrom.cc:609
 msgid "Scanning disc for index files..\n"
 msgstr "Indexfájlok keresése a lemezen...\n"
 
 #: apt-pkg/cdrom.cc:647
-#, c-format
+#, fuzzy, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
-msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n"
+msgstr ""
+"%i csomagindexet, %i forrásindexet, %i fordításindexet és %i aláírást "
+"találtam\n"
 
 #: apt-pkg/cdrom.cc:710
 msgid "That is not a valid name, try again.\n"
-msgstr "Ez a név érvénytelen, próbálja újra.\n"
+msgstr "E név érvénytelen, próbáld újra.\n"
 
 #: apt-pkg/cdrom.cc:726
 #, c-format
@@ -2657,7 +2652,7 @@ msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
-"Ezen lemez neve: \n"
+"E lemez neve: \n"
 "%s\n"
 
 #: apt-pkg/cdrom.cc:730
@@ -2670,7 +2665,7 @@ msgstr "Új forráslista írása\n"
 
 #: apt-pkg/cdrom.cc:763
 msgid "Source list entries for this disc are:\n"
-msgstr "Ezen lemezhez tartozó forráslista-bejegyzések a következők:\n"
+msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n"
 
 #: apt-pkg/cdrom.cc:803
 msgid "Unmounting CD-ROM..."
@@ -2697,55 +2692,87 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "%s megnyitása"
+msgstr "%s előkészítése"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "%s megnyitása"
+msgstr "%s kicsomagolása"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "%s konfigurációs fájl megnyitása"
+msgstr "%s konfigurálásának előkészítése"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Kapcsolódás a következőhöz: %s"
+msgstr "%s konfigurálása"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Telepítve: "
+msgstr "Telepített %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%s eltávolításának előkészítése"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "%s megnyitása"
+msgstr "%s eltávolítása"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Ajánlja"
+msgstr "Eltávolított %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s konfigurálásának előkészítése"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "%s eltávolítása sikertelen"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
-msgstr "A kapcsolat idő előtt befejeződött"
+msgstr "A kapcsolat idő előtt lezárult"
+
+#~ msgid "Total Distinct Descriptions: "
+#~ msgstr "Összes külső leírás: "
+
+#~ msgid "Total Desc/File relations: "
+#~ msgstr "Összes Leírás/Fájl kapcsolat: "
+
+#~ msgid "Reading file list"
+#~ msgstr "Fájllista olvasása"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nem futtatható"
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
+
+#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#~ msgstr ""
+#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni "
+#~ "tud!"
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s konfigurálásával eltávolítva"
+
+#~ msgid "Could not patch file"
+#~ msgstr "%s fájl foltozása sikertelen"
diff --git a/po/it.po b/po/it.po
index 0aa71cf43..08476e84f 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-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-10-05 17:38+0200\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-02-14 11:41+0100\n"
 "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -84,11 +84,11 @@ msgstr "Totale spazio occupato: "
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "Il file dei pacchetti %s � desincronizzato."
+msgstr "Il file dei pacchetti %s non � sincronizzato."
 
 #: cmdline/apt-cache.cc:1231
 msgid "You must give exactly one pattern"
-msgstr "Bisogna dare solamente un pattern"
+msgstr "Bisogna specificare un singolo pattern"
 
 #: cmdline/apt-cache.cc:1385
 msgid "No packages found"
@@ -101,7 +101,7 @@ msgstr "File dei pacchetti:"
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
-"La cache � desincronizzata, impossibile referenziare un file di pacchetti"
+"La cache non � sincronizzata, impossibile referenziare un file di pacchetti"
 
 #: cmdline/apt-cache.cc:1470
 #, c-format
@@ -145,14 +145,14 @@ msgstr "  Tabella versione:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s per %s %s compilato il %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -385,7 +385,7 @@ msgstr ""
 "          clean config\n"
 "\n"
 "apt-ftparchive genera file di indice per gli archivi Debian. Supporta\n"
-"molti stili di generazione da completamente automatici a alternative "
+"molti stili di generazione da completamente automatici a alternative\n"
 "funzionali per dpkg-scanpackages e dpkg-scansources\n"
 "\n"
 "apt-ftparchive genera file Packages da un albero di .deb. Il\n"
@@ -394,12 +394,12 @@ msgstr ""
 "� supportato per forzare il valore di Priorit� e Sezione.\n"
 "\n"
 "Similarmente apt-ftparchive genera file Sources da un albero di .dscs.\n"
-"L'opzione --source-override pu� essere usata per specificare un file di "
-"override per i sorgenti\n"
+"L'opzione --source-override pu� essere usata per specificare un file\n"
+"di override per i sorgenti\n"
 "\n"
-"I comandi 'packages' e 'sources' devono essere seguiti nella root \n"
+"I comandi 'packages' e 'sources' devono essere eseguiti nella root \n"
 "dell'albero. BinaryPath deve puntare alla base della ricerca \n"
-"ricorsiva e il file override devecontenere le opzioni di override. "
+"ricorsiva e il file override deve contenere le opzioni di override.\n"
 "Pathprefix �\n"
 " aggiunto al campo filename se presente. Esempio di utilizzo \n"
 "dall'archivio debian:\n"
@@ -448,7 +448,7 @@ msgstr "La data del file � cambiata %s"
 
 #: ftparchive/cachedb.cc:155
 msgid "Archive has no control record"
-msgstr "L'Archivio non ha un campo control"
+msgstr "L'archivio non ha un campo control"
 
 #: ftparchive/cachedb.cc:267
 msgid "Unable to get a cursor"
@@ -516,7 +516,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limite di %sB raggiunto.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Impossibile analizzare %s"
@@ -593,12 +593,12 @@ msgstr "Impossibile eseguire fork"
 
 #: ftparchive/multicompress.cc:215
 msgid "Compress child"
-msgstr "Figlio compresso"
+msgstr "Sottoprocesso compresso"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "Errore interno, Impossibile creare %s"
+msgstr "Errore interno, impossibile creare %s"
 
 #: ftparchive/multicompress.cc:289
 msgid "Failed to create subprocess IPC"
@@ -630,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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!"
@@ -711,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -864,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -893,103 +893,102 @@ msgstr ""
 "Impossibile prendere alcuni archivi, forse � meglio eseguire apt-get update "
 "o provare l'opzione --fix-missing"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc: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"
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma ma � nominato da un "
-"altropacchetto.\n"
-" Questo significa che il pacchetto manca, � diventato obsoletoo � "
-"disponibile solo all'interno di un'altra sorgente\n"
+"Il pacchetto %s non ha versioni disponibili, ma � nominato da un altro\n"
+"pacchetto. Questo significa che il pacchetto manca, � diventato obsoleto\n"
+"o � disponibile solo all'interno di un'altra sorgente\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc: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"
+msgstr "La reinstallazione di %s non � possibile, non pu� essere 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Il comando update non accetta argomenti"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Impossibile creare un lock sulla directory di list"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -997,26 +996,26 @@ msgstr ""
 "Impossibile scaricare alcune file di indice, essi verranno ignorati, oppure "
 "si useranno quelli precedenti."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Errore interno, AllUpgrade ha rotto qualcosa"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossibile trovare %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1024,7 +1023,7 @@ msgstr ""
 "Dipendenze non soddisfatte. Provare 'apt-get -f install' senza pacchetti (o "
 "specificare una soluzione)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1036,126 +1035,131 @@ 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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
-"Poich� � stata richiesta solo una singola operazione � molto facile che\n"
+"Poich� � stata richiesta solo una singola operazione � molto facile che\n"
 "il pacchetto semplicemente non sia installabile, si consiglia\n"
 "di inviare un \"bug report\" per tale pacchetto."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pacchetto non integro"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "I seguenti pacchetti verranno inoltre installati:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Pacchetti suggeriti:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Pacchetti raccomandati:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento in corso... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Fallito"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Fatto"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, problem resolver ha rotto qualcosa"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
-msgstr "Bisogna specificare almeno un pacchetto cui scaricare il sorgente"
+msgstr "Bisogna specificare almeno un pacchetto di cui scaricare il sorgente"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossibile trovare un pacchetto sorgente per %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Si � saltato il file gi� scaricato '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Lo spazio libero in %s non � sufficente"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "� necessario prendere %sB/%sB di sorgenti.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "� necessario prendere %sB di sorgenti\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Prelievo del sorgente %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Non � stato possibile scaricare alcuni archivi."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando di estrazione '%s' fallito.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, 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:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando di costruzione '%s' fallito.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Processo figlio fallito"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ha dipendenze di costruzione.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1164,7 +1168,7 @@ msgstr ""
 "%s dipendenze per %s non possono essere soddisfatte perch� non si trova il "
 "pacchetto %s"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1173,32 +1177,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "La dipendenza %s per %s: %s � fallita"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Il calcolo delle dipendenze per la costruzione � fallito"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Moduli supportati:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1561,7 +1565,7 @@ msgstr "Impossibile raggiungere la directory admin %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Errore interno nel prendere un nome di un pacchetto"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lettura della lista dei file in corso"
 
@@ -1608,10 +1612,6 @@ msgstr "Errore interno nell'aggiunta di una diversion"
 msgid "The pkg cache must be initialized first"
 msgstr "La cache dei pacchetti deve prima essere inizializzata"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lettura della lista dei file in corso"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1684,12 +1684,12 @@ msgstr "Disco non trovato"
 msgid "File not found"
 msgstr "File non trovato"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Impossibile analizzare"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Impossibile impostare la data di modifica (modification time)"
 
@@ -1818,7 +1818,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problemi nella creazione dell'hash del file"
 
@@ -1841,7 +1841,7 @@ msgstr "Trasferimento dei dati fallito, il server ha detto '%s'"
 msgid "Query"
 msgstr "Query"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
@@ -1871,72 +1871,73 @@ msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Impossibile connettersi a %s:%s (%s), tempo limite di connessione esaurito"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Impossibile connettersi a %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s in corso"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Impossibile risolvere '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "risoluzione di '%s' temporaneamete fallita"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "� accaduto qualcosa di anormale nella risoluzione di '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Impossibile connettersi a %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Impossibile risolvere '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Errore interno: Firma corretta, ma non � stato possibile determinare il "
 "fingerprint della chiave?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "Almeno una firma non valida � stata trovata."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Impossibile eseguire "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr " per verificare la firma (gnugp � installato?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "Le seguenti firme non erano valide:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1954,77 +1955,77 @@ msgstr "Impossibile aprire una pipe per %s"
 msgid "Read error from %s process"
 msgstr "Errore di lettura dal processo %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Si � ottenuto una singola linea di header su %u caratteri"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Linea nell'header non corretta"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Il server HTTP ha inviato un Content-Length non valido"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Il server HTTP ha inviato un Content-Range non valido"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha il supporto del range bacato"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Select fallito"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Tempo limite per la connessione esaurito"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Errore nella scrittura del file di output"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Errore nella scrittura nel file"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Errore nella scrittura nel file"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Errore nella lettura dal server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Header dei dati malformato"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -2320,12 +2321,12 @@ msgstr "Versioni candidate"
 msgid "Dependency generation"
 msgstr "Generazione delle dipendenze"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Impossibile analizzare il file dei pacchetti %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossibile analizzare il file dei pacchetti %s (2)"
@@ -2371,9 +2372,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "La linea %u in %s (type) non � corretta"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2426,11 +2427,18 @@ msgstr "Manca la directory di liste %spartial."
 msgid "Archive directory %spartial is missing."
 msgstr "Manca la directory di archivio %spartial."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Scaricamento del file %li di %li (%s rimanente)"
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Lettura della lista dei file in corso"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2579,11 +2587,16 @@ msgstr "Errore di I/O nel salvataggio del cache sorgente"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename() fallita: %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Somma MD5 non corrispondente"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Non esiste una chiave pubblica disponibile per i seguenti ID di chiave:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, 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 ""
 "che bisogna correggere manualmente l'errore. (a causa di un'architettura "
 "mancante)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2602,7 +2615,7 @@ msgstr ""
 "Non � stato possibile trovare file per il pacchetto %s. Questo significa che "
 "bisogna correggere manualmente l'errore."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2610,7 +2623,7 @@ msgstr ""
 "I file indice dei pacchetti sono corrotti. Non c'� un campo Filename: per il "
 "pacchetto %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Le Dimensioni non corrispondono"
 
@@ -2754,269 +2767,27 @@ msgid "Removed %s"
 msgstr "%s rimosso"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Preparazione per la rimozione con la configurazione %s in corso"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparazione alla configurazione di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "Rimosso con la configurazione %s"
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Impossibile rimuovere %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connessione chiusa prematuramente"
 
-#~ msgid "Write Error"
-#~ msgstr "Errore di Scrittura"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "ID vendor '%s', alla linea %u della lista sorgente %s, sconosciuto"
-
-#~ msgid "File Not Found"
-#~ msgstr "File Non Trovato"
-
-#~ msgid ""
-#~ "Some broken packages were found while trying to process build-"
-#~ "dependencies.\n"
-#~ "You might want to run `apt-get -f install' to correct these."
-#~ msgstr ""
-#~ "Sono stati trovati dei pacchetti con errori mentre si cercava di "
-#~ "cotruire\n"
-#~ "le dipendenze. Si consiglia di eseguire `apt-get -f install` per "
-#~ "correggerli."
-
-#~ msgid "<- '"
-#~ msgstr "<- '"
-
-#~ msgid "'"
-#~ msgstr "'"
-
-#~ msgid "-> '"
-#~ msgstr "-> '"
-
-#~ msgid "Followed conf file from "
-#~ msgstr "Si ÃÂÃÂ¡ seguito il file di configurazione da "
-
-#~ msgid " to "
-#~ msgstr " a "
+#~ msgid "Reading file list"
+#~ msgstr "Lettura della lista dei file in corso"
 
-#~ msgid "Extract "
-#~ msgstr "Estratto "
+#~ msgid "Could not execute "
+#~ msgstr "Impossibile eseguire "
 
-#~ msgid "Aborted, backing out"
-#~ msgstr "Abortito, ripristino in corso"
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparazione per la rimozione con la configurazione %s in corso"
 
-#~ msgid "De-replaced "
-#~ msgstr "Non sostituito"
-
-#~ msgid " from "
-#~ msgstr " da "
-
-#~ msgid "Backing out "
-#~ msgstr "Ripristino in corso "
-
-#~ msgid " [new node]"
-#~ msgstr " [nuovo nodo]"
-
-#~ msgid "Replaced file "
-#~ msgstr "File sostituito "
-
-#~ msgid "Internal Error, Unable to parse a package record"
-#~ msgstr "Errore interno, Impossibile analizzare un campo del pacchetto"
-
-#~ msgid "Unimplemented"
-#~ msgstr "Non Implementato"
-
-#~ msgid "You must give at least one file name"
-#~ msgstr "Bisogna dare almeno un nome di un file"
-
-#~ msgid "Generating cache"
-#~ msgstr "Generazione cache in corso"
-
-#~ msgid "Problem with SelectFile"
-#~ msgstr "Problemi con SelectFile"
-
-#~ msgid "Problem with MergeList"
-#~ msgstr "Problemi con MergeList"
-
-#~ msgid "Regex compilation error"
-#~ msgstr "Errore nella compilazione della regex"
-
-#~ msgid "Write to stdout failed"
-#~ msgstr "Scrittura su stdout fallita"
-
-#~ msgid "Generate must be enabled for this function"
-#~ msgstr "Generate deve essere abilitata per questa funzione"
-
-#~ msgid "Failed to stat %s%s"
-#~ msgstr "Impossibile analizzare %s%s"
-
-#~ msgid "Failed to open %s.new"
-#~ msgstr "Impossibile aprire %s.new"
-
-#~ msgid "Failed to rename %s.new to %s"
-#~ msgstr "Impossibile rinominare %s.new in %s"
-
-#~ msgid "I found (binary):"
-#~ msgstr "Trovati (binary):"
-
-#~ msgid "I found (source):"
-#~ msgstr "Trovati (source):"
-
-#~ msgid "Found "
-#~ msgstr "Trovato "
-
-#~ msgid " source indexes."
-#~ msgstr " sorgenti indicizzati."
-
-#~ msgid ""
-#~ "Unable to locate any package files, perhaps this is not a Debian Disc"
-#~ msgstr "Impossibile trovare file di pacchetti, forse questo non ÃÂÃÂ¡ un disco Debian"
-
-#~ msgid " '"
-#~ msgstr " '"
-
-#~ msgid ""
-#~ "Usage: apt-cdrom [options] command\n"
-#~ "\n"
-#~ "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-#~ "CDROM mount point and device information is taken from apt.conf\n"
-#~ "and /etc/fstab.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   add - Add a CDROM\n"
-#~ "   ident - Report the identity of a CDROM\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h   This help text\n"
-#~ "  -d   CD-ROM mount point\n"
-#~ "  -r   Rename a recognized CD-ROM\n"
-#~ "  -m   No mounting\n"
-#~ "  -f   Fast mode, don't check package files\n"
-#~ "  -a   Thorough scan mode\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See fstab(5)\n"
-#~ msgstr ""
-#~ "Utilizzo: apt-cdrom [opzioni] comando\n"
-#~ "\n"
-#~ "apt-cdrom ÃÂÃÂ¡ un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n"
-#~ "mount point del CDROM e l'informazione della periferica sono presi da apt."
-#~ "conf\n"
-#~ "e /etc/fstab.\n"
-#~ "\n"
-#~ "Comandi:\n"
-#~ "   add - Aggiunge un CDROM\n"
-#~ "   ident - riporta l'identitÃÂÃÂ  di un CDROM\n"
-#~ "\n"
-#~ "Opzioni:\n"
-#~ "  -h   Questo help\n"
-#~ "  -d   Mount point del CDROM\n"
-#~ "  -r   Rinomina un CDROM riconosciuto\n"
-#~ "  -m   Nessun montaggio\n"
-#~ "  -f   ModalitÃÂÃÂ  veloce, non controlla i file dei pacchetti\n"
-#~ "  -a   Scansione in modalitÃÂÃÂ  accurata\n"
-#~ "  -c=? Legge come configurazione il file specificato\n"
-#~ "  -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
-#~ "Vedere fstab(5)\n"
-
-#~ msgid "Internal Error, non-zero counts"
-#~ msgstr "Errore interno, contatori non a zero"
-
-#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
-#~ msgstr ""
-#~ "Spiacente, spazio su disco insufficente in %s per tenere tutti i "
-#~ "pacchetti."
-
-#~ msgid "Couldn't wait for subprocess"
-#~ msgstr "Impossibile attendere il sottoprocesso"
-
-#~ msgid "....\"Have you mooed today?\"..."
-#~ msgstr "....\"Hai muggito oggi?\"..."
-
-#~ msgid " New "
-#~ msgstr " Nuovo "
-
-#~ msgid "B "
-#~ msgstr "B "
-
-#~ msgid " files "
-#~ msgstr " file "
-
-#~ msgid " pkgs in "
-#~ msgstr " pacchetti in "
-
-#~ msgid ""
-#~ "Usage: apt-ftparchive [options] command\n"
-#~ "Commands: packges binarypath [overridefile [pathprefix]]\n"
-#~ "          sources srcpath [overridefile [pathprefix]]\n"
-#~ "          contents path\n"
-#~ "          generate config [groups]\n"
-#~ "          clean config\n"
-#~ msgstr ""
-#~ "Utilizzo: apt-ftparchive [opzioni] comando\n"
-#~ "Comandi: packges binarypath [overridefile [pathprefix]]\n"
-#~ "          sources srcpath [overridefile [pathprefix]]\n"
-#~ "          contents path\n"
-#~ "          generate config [groups]\n"
-#~ "          clean config\n"
-
-#~ msgid ""
-#~ "Options:\n"
-#~ "  -h    This help text\n"
-#~ "  --md5 Control MD5 generation\n"
-#~ "  -s=?  Source override file\n"
-#~ "  -q    Quiet\n"
-#~ "  -d=?  Select the optional caching database\n"
-#~ "  --no-delink Enable delinking debug mode\n"
-#~ "  --contents  Control contents file generation\n"
-#~ "  -c=?  Read this configuration file\n"
-#~ "  -o=?  Set an arbitary configuration option\n"
-#~ msgstr ""
-#~ "Opzioni:\n"
-#~ "  -h   Questo help\n"
-#~ "  -md5 Generazione MD5 di controllo\n"
-#~ "  -s=? file override per i sorgenti.\n"
-#~ "  -q    silenzioso\n"
-#~ "  -d=? Seleziona il database opzionale per la cache\n"
-#~ "  -no-delink Abilita la modalitÃÂÃÂ  di debug per il delink\n"
-#~ "  -contents  Generazione file contents di controllo\n"
-#~ "  -c=? Legge come configurazione il file specificato\n"
-#~ "  -o=? Imposta un'opzione di configurazione\n"
-
-#~ msgid "Done Packages, Starting contents."
-#~ msgstr "Packages terminato, Inizio i contents."
-
-#~ msgid "Hit contents update byte limit"
-#~ msgstr "Limite di byte per l'aggiornamento dei contents processati"
-
-#~ msgid "Done. "
-#~ msgstr "Fatto. "
-
-#~ msgid "B in "
-#~ msgstr "B in "
-
-#~ msgid " archives. Took "
-#~ msgstr " archivi. Sono occorsi"
-
-#~ msgid "B hit."
-#~ msgstr "B hit."
-
-#~ msgid " not "
-#~ msgstr " non "
-
-#~ msgid "DSC file '%s' is too large!"
-#~ msgstr "il file DSC '%s' ÃÂÃÂ¡ troppo largo!"
-
-#~ msgid "Could not find a record in the DSC '%s'"
-#~ msgstr "Impossibile trovare un campo nel DSC '%s'"
-
-#~ msgid "Error parsing file record"
-#~ msgstr "Errore nell'analisi del campo file"
-
-#~ msgid "Failed too stat %s"
-#~ msgstr "Impossibile anche analizzare %s"
-
-#~ msgid "Errors apply to file '%s'"
-#~ msgstr "Gli errori si applicano al file `%s'"
+#~ msgid "Removed with config %s"
+#~ msgstr "Rimosso con la configurazione %s"
diff --git a/po/ja.po b/po/ja.po
index 59b092bfa..f1b55b0e4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,102 +8,102 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-02-09 12:54+0900\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-01-25 20:55+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=EUC-JP\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8 bit\n"
 
 #: cmdline/apt-cache.cc:135
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "�ѥå����� %s �ΥС������ %s �ˤϲ���Բ�ǽ�ʰ�¸�ط�������ޤ�:\n"
+msgstr "パッケージ %s のバージョン %s には解決不可能な依存関係があります:\n"
 
 #: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
 #: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
 #: cmdline/apt-cache.cc:1508
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "�ѥå����� %s �򸫤Ĥ��뤳�Ȥ��Ǥ��ޤ���"
+msgstr "パッケージ %s が見つかりません"
 
 #: cmdline/apt-cache.cc:232
 msgid "Total package names : "
-msgstr "�ѥå�����̾����: "
+msgstr "パッケージ名総数: "
 
 #: cmdline/apt-cache.cc:272
 msgid "  Normal packages: "
-msgstr "  �̾�ѥå�����: "
+msgstr "  通常パッケージ: "
 
 #: cmdline/apt-cache.cc:273
 msgid "  Pure virtual packages: "
-msgstr "  ��貾�ۥѥå�����: "
+msgstr "  純粋仮想パッケージ: "
 
 #: cmdline/apt-cache.cc:274
 msgid "  Single virtual packages: "
-msgstr "  ñ�첾�ۥѥå�����: "
+msgstr "  単一仮想パッケージ: "
 
 #: cmdline/apt-cache.cc:275
 msgid "  Mixed virtual packages: "
-msgstr "  ʣ�精�ۥѥå�����: "
+msgstr "  複合仮想パッケージ: "
 
 #: cmdline/apt-cache.cc:276
 msgid "  Missing: "
-msgstr "  ����: "
+msgstr "  欠落: "
 
 #: cmdline/apt-cache.cc:278
 msgid "Total distinct versions: "
-msgstr "���̥С����������: "
+msgstr "個別バージョン総数: "
 
 #: cmdline/apt-cache.cc:280
 msgid "Total dependencies: "
-msgstr "��¸�ط�����: "
+msgstr "依存関係総数: "
 
 #: cmdline/apt-cache.cc:283
 msgid "Total ver/file relations: "
-msgstr "�С������/�ե�����ط�����: "
+msgstr "バージョン/ファイル関係総数: "
 
 #: cmdline/apt-cache.cc:285
 msgid "Total Provides mappings: "
-msgstr "�󶡥ޥåԥ�����: "
+msgstr "提供マッピング総数: "
 
 #: cmdline/apt-cache.cc:297
 msgid "Total globbed strings: "
-msgstr "Glob ʸ���������: "
+msgstr "Glob 文字列の総数: "
 
 #: cmdline/apt-cache.cc:311
 msgid "Total dependency version space: "
-msgstr "����¸�ط����С����������: "
+msgstr "総依存関係・バージョン容量: "
 
 #: cmdline/apt-cache.cc:316
 msgid "Total slack space: "
-msgstr "����������: "
+msgstr "総空き容量: "
 
 #: cmdline/apt-cache.cc:324
 msgid "Total space accounted for: "
-msgstr "����ͭ����: "
+msgstr "総占有容量: "
 
 #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "Package �ե����� %s ��Ʊ�����Ƥ��ޤ���"
+msgstr "Package ファイル %s が同期していません。"
 
 #: cmdline/apt-cache.cc:1231
 msgid "You must give exactly one pattern"
-msgstr "�ѥ�����Ϥ��礦�� 1 �Ĥ������ꤷ�Ƥ�������"
+msgstr "パターンはちょうど 1 つだけ指定してください"
 
 #: cmdline/apt-cache.cc:1385
 msgid "No packages found"
-msgstr "�ѥå����������Ĥ���ޤ���"
+msgstr "パッケージが見つかりません"
 
 #: cmdline/apt-cache.cc:1462
 msgid "Package files:"
-msgstr "�ѥå������ե�����:"
+msgstr "パッケージファイル:"
 
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "����å��夬Ʊ�����Ƥ��餺���ѥå������ե��������߻��ȤǤ��ޤ���"
+msgstr "キャッシュが同期しておらず、パッケージファイルを相互参照できません"
 
 #: cmdline/apt-cache.cc:1470
 #, c-format
@@ -113,48 +113,48 @@ msgstr "%4i %s\n"
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1482
 msgid "Pinned packages:"
-msgstr "Pin �ѥå�����:"
+msgstr "Pin パッケージ:"
 
 #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
 msgid "(not found)"
-msgstr "(���Ĥ���ޤ���)"
+msgstr "(見つかりません)"
 
 #. Installed version
 #: cmdline/apt-cache.cc:1515
 msgid "  Installed: "
-msgstr "  ���󥹥ȡ��뤵��Ƥ���С������: "
+msgstr "  インストールされているバージョン: "
 
 #: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
 msgid "(none)"
-msgstr "(�ʤ�)"
+msgstr "(なし)"
 
 #. Candidate Version
 #: cmdline/apt-cache.cc:1522
 msgid "  Candidate: "
-msgstr "  ����: "
+msgstr "  候補: "
 
 #: cmdline/apt-cache.cc:1532
 msgid "  Package pin: "
-msgstr "  �ѥå����� Pin: "
+msgstr "  パッケージ Pin: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1541
 msgid "  Version table:"
-msgstr "  �С������ơ��֥�:"
+msgstr "  バージョンテーブル:"
 
 #: cmdline/apt-cache.cc:1556
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
-msgstr "%s %s for %s %s ����ѥ�������: %s %s\n"
+msgstr "%s %s for %s %s コンパイル日時: %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -192,61 +192,58 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"������ˡ: apt-cache [���ץ����] ���ޥ��\n"
-"          apt-cache [���ץ����] add file1 [file2 ...]\n"
-"          apt-cache [���ץ����] showpkg pkg1 [pkg2 ...]\n"
-"          apt-cache [���ץ����] showsrc pkg1 [pkg2 ...]\n"
+"使用方法: apt-cache [オプション] コマンド\n"
+"          apt-cache [オプション] add file1 [file2 ...]\n"
+"          apt-cache [オプション] showpkg pkg1 [pkg2 ...]\n"
+"          apt-cache [オプション] showsrc pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache �� APT �ΥХ��ʥꥭ��å���ե�����������ꡢ���������\n"
-"��򸡺������ꤹ�뤿������٥�Υġ���Ǥ�\n"
+"apt-cache は APT のバイナリキャッシュファイルを操作したり、そこから情\n"
+"報を検索したりするための低レベルのツールです\n"
 "\n"
-"���ޥ��:\n"
-"   add - �ѥå������ե�����򥽡�������å�����ɲä���\n"
-"   gencaches - �ѥå���������ӥ���������å������������\n"
-"   showpkg - ñ��ѥå������ΰ��̾����ɽ������\n"
-"   showsrc - �������쥳���ɤ�ɽ������\n"
-"   stats - ���ܥ��ơ����������ɽ������\n"
-"   dump - ���ƤΥե�������ñ�ʷ�����ɽ������\n"
-"   dumpavail - available �ե������ɸ����Ϥ˽��Ϥ���\n"
-"   unmet - ̤���ΰ�¸�ط���ɽ������\n"
-"   search - ����ɽ���ѥ�����ˤ�äƥѥå������򸡺�����\n"
-"   show - �ѥå������ξ����ɽ������\n"
-"   depends - �ѥå���������¸���Ƥ���ѥå�������ɽ������\n"
-"   rdepends - �ѥå������εհ�¸�����ɽ������\n"
-"   pkgnames - ���ƤΥѥå�����̾��ɽ������\n"
-"   dotty - GraphVis �ѤΥѥå���������դ���������\n"
-"   xvcg - xvcg �ѤΥѥå���������դ���������\n"
-"   policy - �ݥꥷ����������ɽ������\n"
+"コマンド:\n"
+"   add - パッケージファイルをソースキャッシュに追加する\n"
+"   gencaches - パッケージおよびソースキャッシュを生成する\n"
+"   showpkg - 単一パッケージの一般情報を表示する\n"
+"   showsrc - ソースレコードを表示する\n"
+"   stats - 基本ステータス情報を表示する\n"
+"   dump - すべてのファイルを簡単な形式で表示する\n"
+"   dumpavail - available ファイルを標準出力に出力する\n"
+"   unmet - 未解決の依存関係を表示する\n"
+"   search - 正規表現パターンによってパッケージを検索する\n"
+"   show - パッケージの情報を表示する\n"
+"   depends - パッケージが依存しているパッケージを表示する\n"
+"   rdepends - パッケージの逆依存情報を表示する\n"
+"   pkgnames - すべてのパッケージ名を表示する\n"
+"   dotty - GraphVis 用のパッケージグラフを生成する\n"
+"   xvcg - xvcg 用のパッケージグラフを生成する\n"
+"   policy - ポリシー設定情報を表示する\n"
 "\n"
-"���ץ����:\n"
-"  -h   ���Υإ�פ�ɽ������\n"
-"  -p=? �ѥå���������å���\n"
-"  -s=? ����������å���\n"
-"  -q   �ץ����쥹ɽ���򤷤ʤ�\n"
-"  -i   umnet ���ޥ�ɤǽ��פʰ�¸����Τߤ�ɽ������\n"
-"  -c=? ���ꤷ������ե�������ɤ߹���\n"
-"  -o=? ���ꤷ�����ꥪ�ץ������ɤ߹��� (��: -o dir::cache=/tmp)\n"
-"�ܺ٤ϡ�apt-cache(8) �� apt.conf(5) �Υޥ˥奢��ڡ����򻲾Ȥ��Ƥ���������\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -p=? パッケージキャッシュ\n"
+"  -s=? ソースキャッシュ\n"
+"  -q   プログレス表示をしない\n"
+"  -i   umnet コマンドで重要な依存情報のみを表示する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを読み込む (例: -o dir::cache=/tmp)\n"
+"詳細は、apt-cache(8) や apt.conf(5) のマニュアルページを参照してください。\n"
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "このディスクに、'Debian 2.1r1 Disk 1' のような名前を付けてください"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"��ǥ����ѹ�: \n"
-" '%s'\n"
-"�ȥ�٥���դ����ǥ�������ɥ饤�� '%s' ������� enter �򲡤��Ƥ�������\n"
+msgstr "ディスクをドライブに入れて enter を押してください"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
+"あなたの持っている CD セットの残り全部に、この手順を繰り返してください。"
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
-msgstr "�������ڥ��ǤϤ���ޤ���"
+msgstr "引数がペアではありません"
 
 #: cmdline/apt-config.cc:76
 msgid ""
@@ -263,23 +260,23 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"������ˡ: apt-config [���ץ����] ���ޥ��\n"
+"使用方法: apt-config [オプション] コマンド\n"
 "\n"
-"apt-config �� APT ������ե�������ɤ߹��ि��δ�ñ�ʥġ���Ǥ�\n"
+"apt-config は APT の設定ファイルを読み込むための簡単なツールです\n"
 "\n"
-"���ޥ��:\n"
-"   shell - ������⡼��\n"
-"   dump - ��������ɽ������\n"
+"コマンド:\n"
+"   shell - シェルモード\n"
+"   dump - 設定情報を表示する\n"
 "\n"
-"���ץ����:\n"
-"  -h   ���Υإ�פ�ɽ������\n"
-"  -c=? ���ꤷ������ե�������ɤߤ���\n"
-"  -o=? ���ꤷ�����ꥪ�ץ�����Ŭ�Ѥ���(��: -o dir::cache=/tmp)\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する(例: -o dir::cache=/tmp)\n"
 
 #: cmdline/apt-extracttemplates.cc:98
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s �������� DEB �ѥå������ǤϤ���ޤ���"
+msgstr "%s は正しい DEB パッケージではありません。"
 
 #: cmdline/apt-extracttemplates.cc:232
 msgid ""
@@ -294,53 +291,52 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"������ˡ: apt-extracttemplates �ե�����̾1 [�ե�����̾2 ...]\n"
+"使用方法: apt-extracttemplates ファイル名1 [ファイル名2 ...]\n"
 "\n"
-"apt-extracttemplates �� debian �ѥå�������������ȥƥ�ץ졼�Ⱦ����\n"
-"��Ф��뤿��Υġ���Ǥ�\n"
+"apt-extracttemplates は debian パッケージから設定とテンプレート情報を\n"
+"抽出するためのツールです\n"
 "\n"
-"���ץ����:\n"
-"  -h   ���Υإ�פ�ɽ������\n"
-"  -t   ����ǥ��쥯�ȥ����ꤹ��\n"
-"  -c=? ���ꤷ������ե�������ɤߤ���\n"
-"  -o=? ���ꤷ�����ꥪ�ץ�����Ŭ�Ѥ���(��: -o dir::cache=/tmp)\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -t   一時ディレクトリを指定する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
 #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
 #, c-format
 msgid "Unable to write to %s"
-msgstr "%s �˽񤭹���ޤ���"
+msgstr "%s に書き込めません"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
-"debconf �ΥС�����������Ǥ��ޤ���debconf �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���?"
+"debconf のバージョンを取得できません。debconf はインストールされていますか?"
 
 #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
 msgid "Package extension list is too long"
-msgstr "�ѥå�������ĥ�ҥꥹ�Ȥ�Ĺ�᤮�ޤ�"
+msgstr "パッケージ拡張子リストが長すぎます"
 
 #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
 #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
 #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
 #, c-format
 msgid "Error processing directory %s"
-msgstr "�ǥ��쥯�ȥ� %s �ν�����˥��顼��ȯ�����ޤ���"
+msgstr "ディレクトリ %s の処理中にエラーが発生しました"
 
 #: ftparchive/apt-ftparchive.cc:254
 msgid "Source extension list is too long"
-msgstr "��������ĥ�ҥꥹ�Ȥ�Ĺ�᤮�ޤ�"
+msgstr "ソース拡張子リストが長すぎます"
 
 #: ftparchive/apt-ftparchive.cc:371
 msgid "Error writing header to contents file"
-msgstr "Contents �ե�����ؤΥإå��ν񤭹�����˥��顼��ȯ�����ޤ���"
+msgstr "Contents ファイルへのヘッダの書き込み中にエラーが発生しました"
 
 #: ftparchive/apt-ftparchive.cc:401
 #, c-format
 msgid "Error processing contents %s"
-msgstr "Contents %s �ν�����˥��顼��ȯ�����ޤ���"
+msgstr "Contents %s の処理中にエラーが発生しました"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -381,826 +377,830 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
-"������ˡ: apt-ftparchive [���ץ����] ���ޥ��\n"
-"���ޥ��: packages binarypath [overridefile [pathprefix]]\n"
+"使用方法: apt-ftparchive [オプション] コマンド\n"
+"コマンド: packages binarypath [overridefile [pathprefix]]\n"
 "          sources srcpath [overridefile [pathprefix]]\n"
 "          contents path\n"
 "          release path\n"
 "          generate config [groups]\n"
 "          clean config\n"
 "\n"
-"apt-ftparchive �� Debian �����������ѤΥ���ǥå����ե��������������\n"
-"��������ư�Τ�Τ��顢dpkg-scanpackages �� dpkg-scansources �����ص�ǽ\n"
-"�Ȥʤ��Τޤǡ�¿����������ˡ�򥵥ݡ��Ȥ��Ƥ��ޤ���\n"
+"apt-ftparchive は Debian アーカイブ用のインデックスファイルを生成しま\n"
+"す。全自動のものから、dpkg-scanpackages と dpkg-scansources の代替機能\n"
+"となるものまで、多くの生成方法をサポートしています。\n"
 "\n"
-"apt-ftparchive �� .deb �Υĥ꡼���� Packages �ե�������������ޤ���\n"
-"Packages �ե������ MD5 �ϥå����ե����륵�����˲ä��ơ��ƥѥå�����\n"
-"�Τ��٤Ƥ�����ե�����ɤ����Ƥ�ޤ�Ǥ��ޤ���Priority �� Section ����\n"
-"�������뤿��� override �ե����뤬���ݡ��Ȥ���Ƥ��ޤ���\n"
+"apt-ftparchive は .deb のツリーから Packages ファイルを生成します。\n"
+"Packages ファイルは MD5 ハッシュやファイルサイズに加えて、各パッケージ\n"
+"のすべての制御フィールドの内容を含んでいます。Priority と Section の値\n"
+"を強制するために override ファイルがサポートされています。\n"
 "\n"
-"Ʊ�ͤ� apt-ftparchive �� .dsc �Υĥ꡼���� Sources �ե��������������\n"
-"����--source-override ���ץ�������Ѥ���ȥ����� override �ե������\n"
-"����Ǥ��ޤ���\n"
+"同様に apt-ftparchive は .dsc のツリーから Sources ファイルを生成しま\n"
+"す。--source-override オプションを使用するとソース override ファイルを\n"
+"指定できます。\n"
 "\n"
-"'packages' ����� 'sources' ���ޥ�ɤϥĥ꡼�Υ롼�ȤǼ¹Ԥ���ɬ�פ���\n"
-"��ޤ���BinaryPath �ˤϺƵ������Υ١����ǥ��쥯�ȥ����ꤷ��override \n"
-"�ե������ override �ե饰��ޤ�Ǥ���ɬ�פ�����ޤ����⤷ pathprefix \n"
-"��¸�ߤ���Хե�����̾�ե�����ɤ��ղä���ޤ���debian ���������֤Ǥ�\n"
-"������ˡ����:\n"
+"'packages' および 'sources' コマンドはツリーのルートで実行する必要があ\n"
+"ります。BinaryPath には再帰検索のベースディレクトリを指定し、override \n"
+"ファイルは override フラグを含んでいる必要があります。もし pathprefix \n"
+"が存在すればファイル名フィールドに付加されます。debian アーカイブでの\n"
+"使用方法の例:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
-"���ץ����:\n"
-"  -h ���Υإ�פ�ɽ������\n"
-"  --md5 MD5 �����������椹��\n"
-"  -s=?  ������ override �ե�����\n"
-"  -q    ɽ������������\n"
-"  -d=?  ���ץ����Υ���å���ǡ����١��������򤹤�\n"
-"  --no-delink delinking �ǥХå��⡼�ɤ�ͭ���ˤ���\n"
-"  --contents  contents �ե���������������椹��\n"
-"  -c=? ���������ե�������ɤ�\n"
-"  -o=? Ǥ�դ����ꥪ�ץ��������ꤹ��"
+"オプション:\n"
+"  -h このヘルプを表示する\n"
+"  --md5 MD5 の生成を制御する\n"
+"  -s=?  ソース override ファイル\n"
+"  -q    表示を抑制する\n"
+"  -d=?  オプションのキャッシュデータベースを選択する\n"
+"  --no-delink delinking デバッグモードを有効にする\n"
+"  --contents  contents ファイルの生成を制御する\n"
+"  -c=? 指定の設定ファイルを読む\n"
+"  -o=? 任意の設定オプションを設定する"
 
 #: ftparchive/apt-ftparchive.cc:762
 msgid "No selections matched"
-msgstr "����˥ޥå������Τ�����ޤ���"
+msgstr "選択にマッチするものがありません"
 
 #: ftparchive/apt-ftparchive.cc:835
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "�ѥå������ե����륰�롼�� `%s' �˸�������ʤ��ե����뤬����ޤ�"
+msgstr "パッケージファイルグループ `%s' に見当たらないファイルがあります"
 
 #: ftparchive/cachedb.cc:45
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB ������Ƥ������ᡢ�ե�����̾�� %s.old ���ѹ����ޤ���"
+msgstr "DB が壊れていたため、ファイル名を %s.old に変更しました"
 
 #: ftparchive/cachedb.cc:63
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "DB ���Ť����ᡢ%s �Υ��åץ��졼�ɤ��ߤޤ�"
+msgstr "DB が古いため、%s のアップグレードを試みます"
 
 #: ftparchive/cachedb.cc:73
 #, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "DB �ե����� %s �򳫤����Ȥ��Ǥ��ޤ���: %s"
+msgstr "DB ファイル %s を開くことができません: %s"
 
 #: ftparchive/cachedb.cc:114
 #, c-format
 msgid "File date has changed %s"
-msgstr "�ե����� %s �����դ��ѹ�����Ƥ��ޤ�"
+msgstr "ファイル %s の日付が変更されています"
 
 #: ftparchive/cachedb.cc:155
 msgid "Archive has no control record"
-msgstr "���������֤�����쥳���ɤ�����ޤ���"
+msgstr "アーカイブにコントロールレコードがありません"
 
 #: ftparchive/cachedb.cc:267
 msgid "Unable to get a cursor"
-msgstr "�������������Ǥ��ޤ���"
+msgstr "カーソルを取得できません"
 
 #: ftparchive/writer.cc:78
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "�ٹ�: �ǥ��쥯�ȥ� %s ���ɤ�ޤ���\n"
+msgstr "警告: ディレクトリ %s が読めません\n"
 
 #: ftparchive/writer.cc:83
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "�ٹ�: %s �� stat �Ǥ��ޤ���\n"
+msgstr "警告: %s の状態を取得できません\n"
 
 #: ftparchive/writer.cc:125
 msgid "E: "
-msgstr "���顼: "
+msgstr "エラー: "
 
 #: ftparchive/writer.cc:127
 msgid "W: "
-msgstr "�ٹ�: "
+msgstr "警告: "
 
 #: ftparchive/writer.cc:134
 msgid "E: Errors apply to file "
-msgstr "���顼: ���顼��Ŭ�Ѥ����ե������ "
+msgstr "エラー: エラーが適用されるファイルは "
 
 #: ftparchive/writer.cc:151 ftparchive/writer.cc:181
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "%s �β��˼��Ԥ��ޤ���"
+msgstr "%s の解決に失敗しました"
 
 #: ftparchive/writer.cc:163
 msgid "Tree walking failed"
-msgstr "�ĥ꡼��Ǥΰ�ư�˼��Ԥ��ޤ���"
+msgstr "ツリー内での移動に失敗しました"
 
 #: ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to open %s"
-msgstr "%s �Υ����ץ�˼��Ԥ��ޤ���"
+msgstr "%s のオープンに失敗しました"
 
 #: ftparchive/writer.cc:245
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " ��� %s [%s] �򳰤��ޤ�\n"
+msgstr " リンク %s [%s] を外します\n"
 
 #: ftparchive/writer.cc:253
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "%s �� readlink �˼��Ԥ��ޤ���"
+msgstr "%s のリンク読み取りに失敗しました"
 
 #: ftparchive/writer.cc:257
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "%s �� unlink �˼��Ԥ��ޤ���"
+msgstr "%s のリンク解除に失敗しました"
 
 #: ftparchive/writer.cc:264
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** %s �� %s �˥�󥯤���Τ˼��Ԥ��ޤ���"
+msgstr "*** %s を %s にリンクするのに失敗しました"
 
 #: ftparchive/writer.cc:274
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " ��󥯤򳰤����¤� %sB ����ã���ޤ�����\n"
+msgstr " リンクを外す制限の %sB に到達しました。\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
-msgstr "%s �� stat �˼��Ԥ��ޤ���"
+msgstr "%s の状態を取得するのに失敗しました"
 
 #: ftparchive/writer.cc:386
 msgid "Archive had no package field"
-msgstr "���������֤˥ѥå������ե�����ɤ�����ޤ���Ǥ���"
+msgstr "アーカイブにパッケージフィールドがありませんでした"
 
 #: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s �� override ����ȥ꤬����ޤ���\n"
+msgstr "  %s に override エントリがありません\n"
 
 #: 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"
+msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
 
 #: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"
-msgstr "�������顼������ %s ������Ǥ��ޤ���"
+msgstr "内部エラー、メンバー %s を特定できません"
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - ����γ�����Ƥ˼��Ԥ��ޤ���"
+msgstr "realloc - メモリの割り当てに失敗しました"
 
 #: ftparchive/override.cc:38 ftparchive/override.cc:146
 #, c-format
 msgid "Unable to open %s"
-msgstr "'%s' �򥪡��ץ�Ǥ��ޤ���"
+msgstr "'%s' をオープンできません"
 
 #: ftparchive/override.cc:64 ftparchive/override.cc:170
 #, c-format
 msgid "Malformed override %s line %lu #1"
-msgstr "������ override %s %lu ���� #1"
+msgstr "不正な override %s %lu 行目 #1"
 
 #: ftparchive/override.cc:78 ftparchive/override.cc:182
 #, c-format
 msgid "Malformed override %s line %lu #2"
-msgstr "������ override %s %lu ���� #2"
+msgstr "不正な override %s %lu 行目 #2"
 
 #: ftparchive/override.cc:92 ftparchive/override.cc:195
 #, c-format
 msgid "Malformed override %s line %lu #3"
-msgstr "������ override %s %lu ���� #3"
+msgstr "不正な override %s %lu 行目 #3"
 
 #: ftparchive/override.cc:131 ftparchive/override.cc:205
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "override �ե����� %s ���ɤ߹���Τ˼��Ԥ��ޤ���"
+msgstr "override ファイル %s を読み込むのに失敗しました"
 
 #: ftparchive/multicompress.cc:75
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "'%s' ��̤�Τΰ��̥��르�ꥺ��Ǥ�"
+msgstr "'%s' は未知の圧縮アルゴリズムです"
 
 #: ftparchive/multicompress.cc:105
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "���̽��� %s �ˤϰ��̥��åȤ�ɬ�פǤ�"
+msgstr "圧縮出力 %s には圧縮セットが必要です"
 
 #: ftparchive/multicompress.cc:172 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "�ҥץ������ؤ� IPC �ѥ��פκ����˼��Ԥ��ޤ���"
+msgstr "子プロセスへの IPC パイプの作成に失敗しました"
 
 #: ftparchive/multicompress.cc:198
 msgid "Failed to create FILE*"
-msgstr "FILE* �κ����˼��Ԥ��ޤ���"
+msgstr "FILE* の作成に失敗しました"
 
 #: ftparchive/multicompress.cc:201
 msgid "Failed to fork"
-msgstr "fork �˼��Ԥ��ޤ���"
+msgstr "fork に失敗しました"
 
 #: ftparchive/multicompress.cc:215
 msgid "Compress child"
-msgstr "���̻ҥץ�����"
+msgstr "圧縮子プロセス"
 
 #: ftparchive/multicompress.cc:238
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "�������顼��%s �κ����˼��Ԥ��ޤ���"
+msgstr "内部エラー、%s の作成に失敗しました"
 
 #: ftparchive/multicompress.cc:289
 msgid "Failed to create subprocess IPC"
-msgstr "�ҥץ����� IPC �������˼��Ԥ��ޤ���"
+msgstr "子プロセス IPC の生成に失敗しました"
 
 #: ftparchive/multicompress.cc:324
 msgid "Failed to exec compressor "
-msgstr "�ʲ��ΰ��̥ġ���μ¹Ԥ˼��Ԥ��ޤ���: "
+msgstr "以下の圧縮ツールの実行に失敗しました: "
 
 #: ftparchive/multicompress.cc:363
 msgid "decompressor"
-msgstr "Ÿ���ġ���"
+msgstr "展開ツール"
 
 #: ftparchive/multicompress.cc:406
 msgid "IO to subprocess/file failed"
-msgstr "�ҥץ�����/�ե�����ؤ� IO �����Ԥ��ޤ���"
+msgstr "子プロセス/ファイルへの IO が失敗しました"
 
 #: ftparchive/multicompress.cc:458
 msgid "Failed to read while computing MD5"
-msgstr "MD5 �η׻�����ɤ߹��ߤ˼��Ԥ��ޤ���"
+msgstr "MD5 の計算中に読み込みに失敗しました"
 
 #: ftparchive/multicompress.cc:475
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "%s �� unlink �����꤬ȯ�����ޤ���"
+msgstr "%s のリンク解除で問題が発生しました"
 
 #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "%s �� %s �˥�͡���Ǥ��ޤ���Ǥ���"
+msgstr "%s を %s に名前変更できませんでした"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "����ɽ����Ÿ�����顼 - %s"
+msgstr "正規表現の展開エラー - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
 msgid "The following packages have unmet dependencies:"
-msgstr "�ʲ��Υѥå������ˤ��������ʤ���¸�ط�������ޤ�:"
+msgstr "以下のパッケージには満たせない依存関係があります:"
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is installed"
-msgstr "��������%s �ϥ��󥹥ȡ��뤵��Ƥ��ޤ�"
+msgstr "しかし、%s はインストールされています"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
 #, c-format
 msgid "but %s is to be installed"
-msgstr "��������%s �ϥ��󥹥ȡ��뤵��褦�Ȥ��Ƥ��ޤ�"
+msgstr "しかし、%s はインストールされようとしています"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
 msgid "but it is not installable"
-msgstr "�����������󥹥ȡ��뤹�뤳�Ȥ��Ǥ��ޤ���"
+msgstr "しかし、インストールすることができません"
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:338
 msgid "but it is a virtual package"
-msgstr "������������ϲ��ۥѥå������Ǥ�"
+msgstr "しかし、これは仮想パッケージです"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not installed"
-msgstr "�����������󥹥ȡ��뤵��Ƥ��ޤ���"
+msgstr "しかし、インストールされていません"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not going to be installed"
-msgstr "�����������󥹥ȡ��뤵��褦�Ȥ��Ƥ��ޤ���"
+msgstr "しかし、インストールされようとしていません"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
 msgid " or"
-msgstr " �ޤ���"
+msgstr " または"
 
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
 msgid "The following NEW packages will be installed:"
-msgstr "�ʲ��Υѥå������������˥��󥹥ȡ��뤵��ޤ�:"
+msgstr "以下のパッケージが新たにインストールされます:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
-msgstr "�ʲ��Υѥå������ϡֺ���פ���ޤ�:"
+msgstr "以下のパッケージは「削除」されます:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
-msgstr "�ʲ��Υѥå���������α����ޤ�:"
+msgstr "以下のパッケージは保留されます:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
-msgstr "�ʲ��Υѥå������ϥ��åץ��졼�ɤ���ޤ�:"
+msgstr "以下のパッケージはアップグレードされます:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
-msgstr "�ʲ��Υѥå������ϡ֥����󥰥졼�ɡפ���ޤ�:"
+msgstr "以下のパッケージは「ダウングレード」されます:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
-msgstr "�ʲ����ѹ��ػߥѥå��������ѹ�����ޤ�:"
+msgstr "以下の変更禁止パッケージは変更されます:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
 #, c-format
 msgid "%s (due to %s) "
-msgstr "%s (%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 �ġ�"
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "�ƥ��󥹥ȡ���: %lu �ġ�"
+msgstr "再インストール: %lu 個、"
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
 #, c-format
 msgid "%lu downgraded, "
-msgstr "�����󥰥졼��: %lu �ġ�"
+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"
+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"
+msgstr "%lu 個のパッケージが完全にインストールまたは削除されていません。\n"
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
 msgid "Correcting dependencies..."
-msgstr "��¸�ط����褷�Ƥ��ޤ�..."
+msgstr "依存関係を解決しています ..."
 
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
 msgid " failed."
-msgstr " ���Ԥ��ޤ�����"
+msgstr " 失敗しました。"
 
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
 msgid "Unable to correct dependencies"
-msgstr "��¸�ط���ľ�����Ȥ��Ǥ��ޤ���"
+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 " ��λ"
+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' ��¹Ԥ���ɬ�פ����뤫�⤷��ޤ�"
-"��"
+"これらを直すためには 'apt-get -f install' を実行する必要があるかもしれませ"
+"ん。"
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
 msgid "Unmet dependencies. Try using -f."
-msgstr "̤���ΰ�¸�ط�������ޤ���-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]? "
+msgstr "検証なしにこれらのパッケージをインストールしますか [y/N]? "
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
 msgid "Some packages could not be authenticated"
-msgstr "�����Ĥ��Υѥå�������ǧ�ڤ���ޤ���Ǥ���"
+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 "�ѥå������������ʤ���Фʤ�ޤ��󤬡������̵���ˤʤäƤ��ޤ���"
+msgstr "パッケージを削除しなければなりませんが、削除が無効になっています。"
 
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
-msgstr "�������顼��diversion ���ɲ�"
+msgstr "内部エラー、調整が終わっていません"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
-msgstr "����������ɥǥ��쥯�ȥ����å��Ǥ��ޤ���"
+msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
-msgstr "�������Υꥹ�Ȥ��ɤळ�Ȥ��Ǥ��ޤ���"
+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 "%2$sB �� %1$sB �Υ��������֤��������ɬ�פ�����ޤ���\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"
+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"
+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"
+msgstr "展開後に %sB のディスク容量が解放されます。\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, 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 �˽�ʬ�ʶ������ڡ���������ޤ���"
+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 �����ꤵ��ޤ�����������ϴ�ñ�����ǤϤ���ޤ���"
+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
-#, 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"
-"³�Ԥ���ˤϡ�'%s' �Ȥ����ե졼���򥿥��פ��Ƥ���������\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 "���Ǥ��ޤ�����"
+msgstr "中断しました。"
 
-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889
 msgid "Do you want to continue [Y/n]? "
-msgstr "³�Ԥ��ޤ��� [Y/n]? "
+msgstr "続行しますか [Y/n]? "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "%s �μ����˼��Ԥ��ޤ���  %s\n"
+msgstr "%s の取得に失敗しました  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
-msgstr "�����Ĥ��Υե�����μ����˼��Ԥ��ޤ���"
+msgstr "いくつかのファイルの取得に失敗しました"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
-msgstr "����������ɥ���꡼�⡼�ɤǥѥå������Υ���������ɤ���λ���ޤ���"
+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 ""
-"�����Ĥ��Υ��������֤������Ǥ��ޤ���apt-get update ��¹Ԥ��뤫 --fix-"
-"missing ���ץ������դ��ƻ�ƤߤƤ���������"
+"いくつかのアーカイブが取得できません。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 �ȥ�ǥ����򴹤ϸ���Ʊ���ˤϥ��ݡ��Ȥ���Ƥ��ޤ���"
+msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
 msgid "Unable to correct missing packages."
-msgstr "��ʤ��ѥå�������ľ�����Ȥ��Ǥ��ޤ���"
+msgstr "足りないパッケージを直すことができません。"
 
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
 msgid "Aborting install."
-msgstr "���󥹥ȡ�������Ǥ��ޤ���"
+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"
+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"
+"すでにインストールされておりアップグレードも設定されていないため、%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"
+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"
+msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
 
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1081
 msgid " [Installed]"
-msgstr " [���󥹥ȡ���Ѥ�]"
+msgstr " [インストール済み]"
 
-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086
 msgid "You should explicitly select one to install."
-msgstr "���󥹥ȡ��뤹��ѥå�����������Ū�����򤹤�ɬ�פ�����ޤ���"
+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"
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"�ѥå����� %s �ϥǡ����١����ˤ�¸�ߤ��ޤ��������ѤǤ��ޤ���\n"
-"�����餯�����Υѥå����������Ĥ���ʤ������⤦�Ť��ʤäƤ��뤫��\n"
-"���뤤���̤Υ���������Τߤ������ѤǤ��ʤ��Ȥ����������ͤ����ޤ�\n"
+"パッケージ %s はデータベースには存在しますが、利用できません。\n"
+"おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
+"あるいは別のソースからのみしか利用できないという状況が考えられます\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
-msgstr "���������ʲ��Υѥå��������֤��������Ƥ��ޤ�:"
+msgstr "しかし、以下のパッケージで置き換えられています:"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "Package %s has no installation candidate"
-msgstr "�ѥå����� %s �ˤϥ��󥹥ȡ�����䤬����ޤ���"
+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"
+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"
+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' �����Ĥ���ޤ���Ǥ���"
+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' �����Ĥ���ޤ���Ǥ���"
+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"
+msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
 
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
-msgstr "update ���ޥ�ɤϰ�������ޤ���"
+msgstr "update コマンドは引数をとりません"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
-msgstr "list �ǥ��쥯�ȥ����å����뤳�Ȥ��Ǥ��ޤ���"
+msgstr "list ディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "�������顼��AllUpgrade ���������˲����ޤ���"
+msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "�ѥå����� %s �����դ���ޤ���"
+msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
-msgstr "����: ����ɽ�� '%2$s' ���Ф��� %1$s �����򤷤ޤ���\n"
+msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
-"�ʲ���������褹�뤿��� 'apt-get -f install' ��¹Ԥ���ɬ�פ����뤫�⤷��"
-"�ޤ���:"
+"以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
+"ません:"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"̤���ΰ�¸�ط��Ǥ���'apt-get -f install' ��¹Ԥ��ƤߤƤ�������(�ޤ��ϲ�ˡ"
-"���������Ƥ�������)��"
+"未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
+"を明示してください)。"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"���󥹥ȡ��뤹�뤳�Ȥ��Ǥ��ʤ��ѥå�����������ޤ����������餯�����ꤨ\n"
-"�ʤ��������׵ᤷ������ɬ�פʥѥå��������ޤ���������Ƥ��ʤ��ä��� \n"
-"Incoming �����ư����Ƥ��ʤ����԰����ǥǥ����ȥ�ӥ塼��������Ѥ�\n"
-"�Ƥ����Τȹͤ����ޤ���"
+"インストールすることができないパッケージがありました。おそらく、あり得\n"
+"ない状況を要求したか、(不安定版ディストリビューションを使用しているの\n"
+"であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
+"動されていないことが考えられます。"
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
-"ñ�������Ԥä������ʤΤǡ����Υѥå�������ñ�˥��󥹥ȡ���Ǥ��ʤ�\n"
-"��ǽ�����⤤�Ǥ������Τ��ᡢ���Υѥå������ؤΥХ���ݡ��Ȥ����äƤ���\n"
-"������"
+"単純な操作を行っただけなので、このパッケージは単にインストールできない\n"
+"可能性が高いです。そのため、このパッケージへのバグレポートを送ってくだ\n"
+"さい。"
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
-msgstr "�ʲ��ξ��󤬤���������褹�뤿�����Ω�Ĥ��⤷��ޤ���:"
+msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
-msgstr "���줿�ѥå�����"
+msgstr "壊れたパッケージ"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
-msgstr "�ʲ������̥ѥå����������󥹥ȡ��뤵��ޤ�:"
+msgstr "以下の特別パッケージがインストールされます:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
-msgstr "��ƥѥå�����:"
+msgstr "提案パッケージ:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
-msgstr "�侩�ѥå�����:"
+msgstr "推奨パッケージ:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
-msgstr "���åץ��졼�ɥѥå������򸡽Ф��Ƥ��ޤ�... "
+msgstr "アップグレードパッケージを検出しています ... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
-msgstr "����"
+msgstr "失敗"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
-msgstr "��λ"
+msgstr "完了"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "�������顼��AllUpgrade ���������˲����ޤ���"
+msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
-"���������������ˤϾ��ʤ��Ȥ�ҤȤĤΥѥå�����̾����ꤹ��ɬ�פ�����ޤ�"
+"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "%s �Υ������ѥå����������Ĥ���ޤ���"
+msgstr "%s のソースパッケージが見つかりません"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "%s �˽�ʬ�ʶ������ڡ���������ޤ���"
+msgstr "%s に充分な空きスペースがありません"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "%2$sB �� %1$sB �Υ��������������֤��������ɬ�פ�����ޤ���\n"
+msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "%sB �Υ��������������֤��������ɬ�פ�����ޤ���\n"
+msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "������ %s �����\n"
+msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
-msgstr "�����Ĥ��Υ��������֤μ����˼��Ԥ��ޤ�����"
+msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "���Ǥ� %s ��Ÿ�����줿�����������뤿�ᡢŸ���򥹥��åפ��ޤ�\n"
+msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "Ÿ�����ޥ�� '%s' �����Ԥ��ޤ�����\n"
+msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
+"'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
-msgstr "�ӥ�ɥ��ޥ�� '%s' �����Ԥ��ޤ�����\n"
+msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
-msgstr "�ҥץ����������Ԥ��ޤ���"
+msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
-"builddeps ������å�����ѥå������򾯤ʤ��Ȥ� 1 �Ļ��ꤹ��ɬ�פ�����ޤ�"
+"ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "%s �� build-dependency ��������뤳�Ȥ��Ǥ��ޤ���"
+msgstr "%s のビルド依存情報を取得できません"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s �ˤ� build depends �����ꤵ��Ƥ��ޤ���\n"
+msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"�ѥå����� %3$s �����Ĥ���ʤ����ᡢ%2$s ���Ф��� %1$s �ΰ�¸�ط�������������"
-"���Ǥ��ޤ���"
+"パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
+"ができません"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
-"�����ǽ�� %3$s �Ϥ������С������ˤĤ��Ƥ��׵���������ʤ����ᡢ%2$s ����"
-"���� %1$s �ΰ�¸�ط������������Ȥ��Ǥ��ޤ���"
+"入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
+"する %1$s の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"%2$s �ΰ�¸�ط� %1$s �����������Ȥ��Ǥ��ޤ���: ���󥹥ȡ��뤵�줿 %3$s �ѥ�"
-"�������Ͽ��������ޤ�"
+"%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
+"ケージは新しすぎます"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s �ΰ�¸�ط� %1$s �����������Ȥ��Ǥ��ޤ���: %3$s"
+msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s �� Build-dependency �����������Ȥ��Ǥ��ޤ���Ǥ�����"
+msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
-msgstr "build dependency �ν����˼��Ԥ��ޤ���"
+msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
-msgstr "���ݡ��Ȥ���Ƥ���⥸�塼��:"
+msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1241,73 +1241,73 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"����ˡ: apt-get [���ץ����] ���ޥ��\n"
-"        apt-get [���ץ����] install|remove �ѥå�����̾1 [�ѥå�����̾"
+"使用法: apt-get [オプション] コマンド\n"
+"        apt-get [オプション] install|remove パッケージ名1 [パッケージ名"
 "2 ...]\n"
-"        apt-get [���ץ����] source �ѥå�����̾1 [�ѥå�����̾2 ...]\n"
+"        apt-get [オプション] source パッケージ名1 [パッケージ名2 ...]\n"
 "\n"
-"apt-get �ϡ��ѥå�����������������/���󥹥ȡ��뤹�뤿��δ�ñ�ʥ���\n"
-"��ɥ饤�󥤥󥿥ե������Ǥ�����äȤ�褯�Ȥ��륳�ޥ�ɤϡ�update \n"
-"�� install �Ǥ���\n"
+"apt-get は、パッケージをダウンロード/インストールするための簡単なコマ\n"
+"ンドラインインタフェースです。もっともよく使われるコマンドは、update \n"
+"と install です。\n"
 "\n"
-"���ޥ��:\n"
-"   update - �ѥå������ꥹ�Ȥ�������������ޤ�\n"
-"   upgrade - ���åץ��졼�ɤ�Ԥ��ޤ�\n"
-"   install - �����ѥå������򥤥󥹥ȡ��뤷�ޤ�\n"
-"             (pkg �� libc6.deb �ǤϤʤ� libc6 �Τ褦�˻��ꤷ�ޤ�)\n"
-"   remove - �ѥå������������ޤ�\n"
-"   source - ���������������֤����������ɤ��ޤ�\n"
-"   build-dep - �������ѥå������ι��۰�¸�ط������ꤷ�ޤ�\n"
-"   dist-upgrade - �ǥ����ȥ�ӥ塼�����򥢥åץ��졼�ɤ��ޤ�\n"
-"                  (apt-get(8) �򻲾�)\n"
-"   dselect-upgrade - dselect ������ˤ��������ޤ�\n"
-"   clean - ����������ɤ������������֥ե�����������ޤ�\n"
-"   autoclean - ����������ɤ����Ť����������֥ե�����������ޤ�\n"
-"   check -  ���줿��¸�ط����ʤ��������å����ޤ�\n"
+"コマンド:\n"
+"   update - パッケージリストを取得・更新します\n"
+"   upgrade - アップグレードを行います\n"
+"   install - 新規パッケージをインストールします\n"
+"             (pkg は libc6.deb ではなく libc6 のように指定します)\n"
+"   remove - パッケージを削除します\n"
+"   source - ソースアーカイブをダウンロードします\n"
+"   build-dep - ソースパッケージの構築依存関係を設定します\n"
+"   dist-upgrade - ディストリビューションをアップグレードします\n"
+"                  (apt-get(8) を参照)\n"
+"   dselect-upgrade - dselect の選択に従います\n"
+"   clean - ダウンロードしたアーカイブファイルを削除します\n"
+"   autoclean - ダウンロードした古いアーカイブファイルを削除します\n"
+"   check -  壊れた依存関係がないかチェックします\n"
 "\n"
-"���ץ����:\n"
-"  -h  ���Υإ�פ�ɽ������\n"
-"  -q  �����ե�����˽��ϲ�ǽ�ʷ����ˤ��� - �ץ����쥹ɽ���򤷤ʤ�\n"
-"  -qq  ���顼�ʳ���ɽ�����ʤ�\n"
-"  -d  ����������ɤΤ߹Ԥ� - ���������֤Υ��󥹥ȡ����Ÿ���ϹԤ�ʤ�\n"
-"  -s  �ºݤˤϼ¹Ԥ��ʤ����¹ԥ��ߥ�졼�����Τ߹Ԥ�\n"
-"  -y  ���Ƥ��䤤��碌�� Yes ���������ץ���ץȤ��֤��ʤ�\n"
-"  -f  �����������å��Ǽ��Ԥ��Ƥ������³�Ԥ���\n"
-"  -m  ���������֤�¸�ߤ��ʤ�����³�Ԥ���\n"
-"  -u  ���åץ��졼�ɤ����ѥå�������ɽ������\n"
-"  -b  �������ѥå���������������ӥ�ɤ�Ԥ�\n"
-"  -V  ��Ĺ�ʥС������ʥ�Ф�ɽ������\n"
-"  -c=? ���ꤷ������ե�������ɤ߹���\n"
-"  -o=? Ǥ�դ����ꥪ�ץ�������ꤹ��, �� -o dir::cache=/tmp\n"
-"���ץ��������˴ؤ��Ƥϡ��ޥ˥奢��ڡ��� apt-get(8)��sources.list(5)��\n"
-"apt.conf(5) �򻲾Ȥ��Ƥ���������\n"
-"                        ���� APT �� Super Cow Powers ������Ƥ��ޤ���\n"
+"オプション:\n"
+"  -h  このヘルプを表示する\n"
+"  -q  ログファイルに出力可能な形式にする - プログレス表示をしない\n"
+"  -qq  エラー以外は表示しない\n"
+"  -d  ダウンロードのみ行う - アーカイブのインストールや展開は行わない\n"
+"  -s  実際には実行しない。実行シミュレーションのみ行う\n"
+"  -y  すべての問い合わせに Yes で答え、プロンプトは返さない\n"
+"  -f  整合性チェックで失敗しても処理を続行する\n"
+"  -m  アーカイブが存在しない場合も続行する\n"
+"  -u  アップグレードされるパッケージも表示する\n"
+"  -b  ソースパッケージを取得し、ビルドを行う\n"
+"  -V  冗長なバージョンナンバを表示する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 任意の設定オプションを指定する, 例 -o dir::cache=/tmp\n"
+"オプション・設定に関しては、マニュアルページ apt-get(8)、sources.list(5)、\n"
+"apt.conf(5) を参照してください。\n"
+"                        この APT は Super Cow Powers 化されています。\n"
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
-msgstr "�ҥå� "
+msgstr "ヒット "
 
 #: cmdline/acqprogress.cc:79
 msgid "Get:"
-msgstr "����:"
+msgstr "取得:"
 
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
-msgstr "̵�� "
+msgstr "無視 "
 
 #: cmdline/acqprogress.cc:114
 msgid "Err "
-msgstr "���顼 "
+msgstr "エラー "
 
 #: cmdline/acqprogress.cc:135
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%sB �� %s �Ǽ������ޤ��� (%sB/s)\n"
+msgstr "%sB を %s で取得しました (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:225
 #, c-format
 msgid " [Working]"
-msgstr " [������]"
+msgstr " [処理中]"
 
 #: cmdline/acqprogress.cc:271
 #, c-format
@@ -1316,13 +1316,13 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"��ǥ����ѹ�: \n"
+"メディア変更: \n"
 " '%s'\n"
-"�ȥ�٥���դ����ǥ�������ɥ饤�� '%s' ������� enter �򲡤��Ƥ�������\n"
+"とラベルの付いたディスクをドライブ '%s' に入れて enter を押してください\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
-msgstr "�����ʥѥå������쥳���ɤǤ�!"
+msgstr "不明なパッケージレコードです!"
 
 #: cmdline/apt-sortpkgs.cc:150
 msgid ""
@@ -1337,228 +1337,228 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"������ˡ: apt-sortpkgs [���ץ����] �ե�����̾1 [�ե�����̾2 ...]\n"
+"使用方法: apt-sortpkgs [オプション] ファイル名1 [ファイル名2 ...]\n"
 "\n"
-"apt-sortpkgs �ϥѥå������ե�����򥽡��Ȥ��뤿��δ�ñ�ʥġ���Ǥ���\n"
-"-s ���ץ����ϥե�����μ���򼨤�����˻��Ѥ���ޤ���\n"
+"apt-sortpkgs はパッケージファイルをソートするための簡単なツールです。\n"
+"-s オプションはファイルの種類を示すために使用されます。\n"
 "\n"
-"���ץ����:\n"
-"  -h   ���Υإ�פ�ɽ������\n"
-"  -s   �������ե����륽���Ȥ���Ѥ���\n"
-"  -c=? ���ꤷ������ե�������ɤߤ���\n"
-"  -o=? ���ꤷ�����ꥪ�ץ�����Ŭ�Ѥ���(��: -o dir::cache=/tmp)\n"
+"オプション:\n"
+"  -h   このヘルプを表示する\n"
+"  -s   ソースファイルソートを使用する\n"
+"  -c=? 指定した設定ファイルを読み込む\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
 #: dselect/install:32
 msgid "Bad default setting!"
-msgstr "�ǥե���Ȥ����꤬�褯����ޤ���!"
+msgstr "不正なデフォルト設定です!"
 
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
 #: dselect/install:104 dselect/update:45
 msgid "Press enter to continue."
-msgstr "enter �򲡤���³�Ԥ��ޤ���"
+msgstr "enter を押すと続行します。"
 
 #: dselect/install:100
 msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Ÿ����˥��顼��ȯ�����ޤ��������󥹥ȡ��뤵�줿�ѥå�������"
+msgstr "展開中にエラーが発生しました。インストールされたパッケージを"
 
 #: dselect/install:101
 msgid "packages that were installed. This may result in duplicate errors"
-msgstr "���ꤷ�ޤ�������ˤ�ꡢ���顼��ʣ���Ф뤫����¸�ط��η�ǡ��"
+msgstr "設定します。これにより、エラーが複数出るか、依存関係の欠如に"
 
 #: dselect/install:102
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "��륨�顼���Ф뤫�⤷��ޤ��󡣤���ˤ�����Ϥʤ����嵭�Υ�å�����"
+msgstr "よるエラーが出るかもしれません。これには問題はなく、上記のメッセージ"
 
 #: dselect/install:103
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
-msgstr "�����פǤ�������������� [I]nstall ����ټ¹Ԥ��Ƥ�������"
+msgstr "が重要です。これを修正して「導入」を再度実行してください"
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "�����ǽ�����ޡ������Ƥ��ޤ�"
+msgstr "入手可能情報をマージしています"
 
 #: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
-msgstr "�ѥ��פ������˼��Ԥ��ޤ���"
+msgstr "パイプの生成に失敗しました"
 
 #: apt-inst/contrib/extracttar.cc:143
 msgid "Failed to exec gzip "
-msgstr "gzip �μ¹Ԥ˼��Ԥ��ޤ���"
+msgstr "gzip の実行に失敗しました"
 
 #: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
 msgid "Corrupted archive"
-msgstr "���줿����������"
+msgstr "壊れたアーカイブ"
 
 #: apt-inst/contrib/extracttar.cc:195
 msgid "Tar checksum failed, archive corrupted"
-msgstr "tar �����å����ब���Ԥ��ޤ��������������֤�����Ƥ��ޤ�"
+msgstr "tar チェックサムが失敗しました。アーカイブが壊れています"
 
 #: apt-inst/contrib/extracttar.cc:298
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "̤�Τ� TAR �إå������� %u������ %s"
+msgstr "未知の TAR ヘッダタイプ %u、メンバー %s"
 
 #: apt-inst/contrib/arfile.cc:73
 msgid "Invalid archive signature"
-msgstr "�����ʥ��������ֽ�̾"
+msgstr "不正なアーカイブ署名"
 
 #: apt-inst/contrib/arfile.cc:81
 msgid "Error reading archive member header"
-msgstr "���������֥��Хإå����ɤ߹��ߤ˼��Ԥ��ޤ���"
+msgstr "アーカイブメンバーヘッダの読み込みに失敗しました"
 
 #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
 msgid "Invalid archive member header"
-msgstr "�����ʥ��������֥��Хإå�"
+msgstr "不正なアーカイブメンバーヘッダ"
 
 #: apt-inst/contrib/arfile.cc:131
 msgid "Archive is too short"
-msgstr "���������֤������Ƥ��ޤ�"
+msgstr "アーカイブが不足しています"
 
 #: apt-inst/contrib/arfile.cc:135
 msgid "Failed to read the archive headers"
-msgstr "���������֥إå����ɤ߹��ߤ˼��Ԥ��ޤ���"
+msgstr "アーカイブヘッダの読み込みに失敗しました"
 
 #: apt-inst/filelist.cc:384
 msgid "DropNode called on still linked node"
-msgstr "��󥯤���Ƥ���Ρ��ɤ� DropNode ���ƤФ�ޤ���"
+msgstr "リンクされているノードで DropNode が呼ばれました"
 
 #: apt-inst/filelist.cc:416
 msgid "Failed to locate the hash element!"
-msgstr "�ϥå������Ǥ����ꤹ�뤳�Ȥ��Ǥ��ޤ���!"
+msgstr "ハッシュ要素を特定することができません!"
 
 #: apt-inst/filelist.cc:463
 msgid "Failed to allocate diversion"
-msgstr "diversion �γ�����Ƥ˼��Ԥ��ޤ���"
+msgstr "diversion の割り当てに失敗しました"
 
 #: apt-inst/filelist.cc:468
 msgid "Internal error in AddDiversion"
-msgstr "AddDiversion �Ǥ��������顼"
+msgstr "AddDiversion での内部エラー"
 
 #: apt-inst/filelist.cc:481
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "%s -> %s �� %s/%s �� diversion ���񤭤��褦�Ȥ��Ƥ��ޤ�"
+msgstr "%s -> %s と %s/%s の diversion を上書きしようとしています"
 
 #: apt-inst/filelist.cc:510
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "%s -> %s �� diversion ����Ť��ɲä���Ƥ��ޤ�"
+msgstr "%s -> %s の diversion が二重に追加されています"
 
 #: apt-inst/filelist.cc:553
 #, c-format
 msgid "Duplicate conf file %s/%s"
-msgstr "����ե����� %s/%s ����ʣ���Ƥ��ޤ�"
+msgstr "設定ファイル %s/%s が重複しています"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
-msgstr "%s �ν񤭹��ߤ˼��Ԥ��ޤ���"
+msgstr "ファイル %s の書き込みに失敗しました"
 
 #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
 msgid "Failed to close file %s"
-msgstr "%s �Υ��������˼��Ԥ��ޤ���"
+msgstr "%s のクローズに失敗しました"
 
 #: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
-msgstr "�ѥ� %s ��Ĺ�����ޤ�"
+msgstr "パス %s は長すぎます"
 
 #: apt-inst/extract.cc:127
 #, c-format
 msgid "Unpacking %s more than once"
-msgstr "%s ��ʣ����Ÿ�����Ƥ��ޤ�"
+msgstr "%s を複数回展開しています"
 
 #: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "�ǥ��쥯�ȥ� %s �� divert ����Ƥ��ޤ�"
+msgstr "ディレクトリ %s は divert されています"
 
 #: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
-"���Υѥå������� diversion �Υ������åȤ� %s/%s �˽񤭹��⤦�Ȥ��Ƥ��ޤ�"
+"このパッケージは diversion のターゲットの %s/%s に書き込もうとしています"
 
 #: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
-msgstr "diversion �ѥ���Ĺ�����ޤ�"
+msgstr "diversion パスが長すぎます"
 
 #: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
-msgstr "�ǥ��쥯�ȥ� %s ����ǥ��쥯�ȥ���ִ�����褦�Ȥ��Ƥ��ޤ�"
+msgstr "ディレクトリ %s が非ディレクトリに置換されようとしています"
 
 #: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
-msgstr "�ϥå���Х�����ǥΡ��ɤ����ꤹ��Τ˼��Ԥ��ޤ���"
+msgstr "ハッシュバケツ内でノードを特定するのに失敗しました"
 
 #: apt-inst/extract.cc:287
 msgid "The path is too long"
-msgstr "�ѥ���Ĺ�����ޤ�"
+msgstr "パスが長すぎます"
 
 #: apt-inst/extract.cc:417
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "%s ���Ф���С������Τʤ��ѥå������ޥå����񤭤��ޤ�"
+msgstr "%s に対するバージョンのないパッケージマッチを上書きします"
 
 #: apt-inst/extract.cc:434
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
-msgstr "�ե����� %s/%s ���ѥå����� %s �Τ�Τ��񤭤��ޤ�"
+msgstr "ファイル %s/%s がパッケージ %s のものを上書きします"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
 #: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"
-msgstr "%s ���ɤ߹��ळ�Ȥ��Ǥ��ޤ���"
+msgstr "%s を読み込むことができません"
 
 #: apt-inst/extract.cc:494
 #, c-format
 msgid "Unable to stat %s"
-msgstr "%s �� stat �Ǥ��ޤ���"
+msgstr "%s の状態を取得できません"
 
 #: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
-msgstr "%s �κ���˼��Ԥ��ޤ���"
+msgstr "%s の削除に失敗しました"
 
 #: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
-msgstr "%s ������Ǥ��ޤ���"
+msgstr "%s を作成できません"
 
 #: apt-inst/deb/dpkgdb.cc:118
 #, c-format
 msgid "Failed to stat %sinfo"
-msgstr "%sinfo �� stat �˼��Ԥ��ޤ���"
+msgstr "%sinfo の状態の取得に失敗しました"
 
 #: apt-inst/deb/dpkgdb.cc:123
 msgid "The info and temp directories need to be on the same filesystem"
-msgstr "info �� temp �ǥ��쥯�ȥ��Ʊ���ե����륷���ƥ��ˤʤ���Фʤ�ޤ���"
+msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません"
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 #: apt-pkg/pkgcachegen.cc:840
 msgid "Reading package lists"
-msgstr "�ѥå������ꥹ�Ȥ��ɤߤ���Ǥ��ޤ�"
+msgstr "パッケージリストを読み込んでいます"
 
 #: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
-msgstr "�����ǥ��쥯�ȥ� %sinfo �ؤΰ�ư�˼��Ԥ��ޤ���"
+msgstr "管理ディレクトリ %sinfo への移動に失敗しました"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
 msgid "Internal error getting a package name"
-msgstr "�ѥå�����̾��������������顼"
+msgstr "パッケージ名取得中の内部エラー"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
-msgstr "�ե�����ꥹ�Ȥ��ɤ߹���Ǥ��ޤ�"
+msgstr "ファイルリストを読み込んでいます"
 
 #: apt-inst/deb/dpkgdb.cc:216
 #, c-format
@@ -1567,284 +1567,280 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"�ꥹ�ȥե����� '%sinfo/%s' �Υ����ץ�˼��Ԥ��ޤ��������Υե�����򸵤��᤹��"
-"�Ȥ��Ǥ��ʤ��ʤ顢�������Ƥ���ˤ���¨�¤�Ʊ���С������Υѥå�������ƥ���"
-"���ȡ��뤷�Ƥ�������!"
+"リストファイル '%sinfo/%s' のオープンに失敗しました。このファイルを元に戻すこ"
+"とができないなら、その内容を空にして即座に同じバージョンのパッケージを再イン"
+"ストールしてください!"
 
 #: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
-msgstr "�ꥹ�ȥե����� %sinfo/%s ���ɤ߹��ߤ˼��Ԥ��ޤ���"
+msgstr "リストファイル %sinfo/%s の読み込みに失敗しました"
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgid "Internal error getting a node"
-msgstr "�������顼���Ρ��ɤμ���"
+msgstr "内部エラー、ノードの取得"
 
 #: apt-inst/deb/dpkgdb.cc:309
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "diversions �ե����� %sdiversions �Υ����ץ�˼��Ԥ��ޤ���"
+msgstr "diversions ファイル %sdiversions のオープンに失敗しました"
 
 #: apt-inst/deb/dpkgdb.cc:324
 msgid "The diversion file is corrupted"
-msgstr "diversion �ե����뤬����Ƥ��ޤ�"
+msgstr "diversion ファイルが壊れています"
 
 #: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
 #: apt-inst/deb/dpkgdb.cc:341
 #, c-format
 msgid "Invalid line in the diversion file: %s"
-msgstr "diversion �ե�����������ʹԤ�����ޤ�: %s"
+msgstr "diversion ファイルに不正な行があります: %s"
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgid "Internal error adding a diversion"
-msgstr "�������顼��diversion ���ɲ�"
+msgstr "内部エラー、diversion の追加"
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgid "The pkg cache must be initialized first"
-msgstr "�ǽ�˥ѥå���������å�����������ʤ���Фʤ�ޤ���"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "�ե�����ꥹ�Ȥ��ɤߤ���Ǥ��ޤ�"
+msgstr "最初にパッケージキャッシュを初期化しなければなりません"
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr "Package: �إå��򸫤Ĥ���Τ˼��Ԥ��ޤ��������ե��å� %lu"
+msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu"
 
 #: apt-inst/deb/dpkgdb.cc:465
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "status �ե������������ ConfFile ��������󤬤���ޤ������ե��å� %lu"
+msgstr "status ファイルに不正な ConfFile セクションがあります。オフセット %lu"
 
 #: apt-inst/deb/dpkgdb.cc:470
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
-msgstr "MD5 �β��ϥ��顼�����ե��å� %lu"
+msgstr "MD5 の解析エラー。オフセット %lu"
 
 #: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "'%s' ���Ф��ʤ����ᡢ������ DEB ���������֤ǤϤ���ޤ���"
+msgstr "'%s' メンバーがないため、正しい DEB アーカイブではありません"
 
 #: apt-inst/deb/debfile.cc:52
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
 msgstr ""
-"'%s' �ޤ��� '%s' ���Ф��ʤ����ᡢ����������� DEB ���������֤ǤϤ���ޤ���"
+"'%s' または '%s' メンバーがないため、これは正しい DEB アーカイブではありませ"
+"ん"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
 msgid "Couldn't change to %s"
-msgstr "%s ���ѹ��Ǥ��ޤ���Ǥ���"
+msgstr "%s に変更できませんでした"
 
 #: apt-inst/deb/debfile.cc:138
 msgid "Internal error, could not locate member"
-msgstr "�������顼�����Ф�����Ǥ��ޤ���"
+msgstr "内部エラー、メンバーを特定できません"
 
 #: apt-inst/deb/debfile.cc:171
 msgid "Failed to locate a valid control file"
-msgstr "����������ե����������Ǥ��ޤ���Ǥ���"
+msgstr "正しいコントロールファイルを特定できませんでした"
 
 #: apt-inst/deb/debfile.cc:256
 msgid "Unparsable control file"
-msgstr "���ϤǤ��ʤ�����ե�����"
+msgstr "解析できないコントロールファイル"
 
 #: methods/cdrom.cc:114
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "cdrom �ǡ����١��� %s ���ɤߤ��ळ�Ȥ��Ǥ��ޤ���"
+msgstr "CD-ROM データベース %s を読み込むことができません"
 
 #: methods/cdrom.cc:123
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"���� CD �� APT ��ǧ��������ˤ� apt-cdrom ����Ѥ��Ƥ��������������� CD ����"
-"�ä��뤿��� apt-get update �ϻ��ѤǤ��ޤ���"
+"この CD-ROM を APT に認識させるには apt-cdrom を使用してください。新しい CD-"
+"ROM を追加するために apt-get update は使用できません。"
 
 #: methods/cdrom.cc:131
 msgid "Wrong CD-ROM"
-msgstr "CD ���㤤�ޤ�"
+msgstr "CD が違います"
 
 #: methods/cdrom.cc:164
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "%s �� CD-ROM �ϻ�����Τ��ᥢ��ޥ���Ȥ��뤳�Ȥ��Ǥ��ޤ���"
+msgstr "%s の CD-ROM は使用中のためアンマウントすることができません。"
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "�ե����뤬�ߤĤ���ޤ���"
+msgstr "ディスクが見つかりません。"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
-msgstr "�ե����뤬�ߤĤ���ޤ���"
+msgstr "ファイルが見つかりません"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
-msgstr "stat �˼��Ԥ��ޤ���"
+msgstr "状態の取得に失敗しました"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
-msgstr "�ѹ����������˼��Ԥ��ޤ���"
+msgstr "変更時刻の設定に失敗しました"
 
 #: methods/file.cc:44
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "������ URI �Ǥ������������ URI �� // �ǻϤޤäƤϤ����ޤ���"
+msgstr "不正な URI です。ローカルの URI は // で始まってはいけません"
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:162
 msgid "Logging in"
-msgstr "�������󤷤Ƥ��ޤ�"
+msgstr "ログインしています"
 
 #: methods/ftp.cc:168
 msgid "Unable to determine the peer name"
-msgstr "�ԥ��͡������ꤹ�뤳�Ȥ��Ǥ��ޤ���"
+msgstr "ピアネームを決定することができません"
 
 #: methods/ftp.cc:173
 msgid "Unable to determine the local name"
-msgstr "��������͡������ꤹ�뤳�Ȥ��Ǥ��ޤ���"
+msgstr "ローカルネームを決定することができません"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "�����Ф�����³����䤵��ޤ���������: %s"
+msgstr "サーバから接続を拒絶されました。応答: %s"
 
 #: methods/ftp.cc:210
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "USER ���ԡ������б���: %s"
+msgstr "USER 失敗、サーバ応答: %s"
 
 #: methods/ftp.cc:217
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "PASS ���ԡ������б���: %s"
+msgstr "PASS 失敗、サーバ応答: %s"
 
 #: methods/ftp.cc:237
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
-"�ץ����������Ф����ꤵ��Ƥ��ޤ������������󥹥���ץȤ����ꤵ��Ƥ��ޤ���"
-"Acquire::ftp::ProxyLogin �����Ǥ���"
+"プロキシサーバが指定されていますが、ログインスクリプトが設定されていません。"
+"Acquire::ftp::ProxyLogin が空です。"
 
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "�������󥹥���ץȤΥ��ޥ�� '%s' ���ԡ������б���: %s"
+msgstr "ログインスクリプトのコマンド '%s' 失敗、サーバ応答: %s"
 
 #: methods/ftp.cc:291
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "TYPE ���ԡ������б���: %s"
+msgstr "TYPE 失敗、サーバ応答: %s"
 
 #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
-msgstr "��³�����ॢ����"
+msgstr "接続タイムアウト"
 
 #: methods/ftp.cc:335
 msgid "Server closed the connection"
-msgstr "�����Ф���³�����Ǥ��ޤ���"
+msgstr "サーバが接続を切断しました"
 
 #: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
 msgid "Read error"
-msgstr "�ɤ߹��ߥ��顼"
+msgstr "読み込みエラー"
 
 #: methods/ftp.cc:345 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
-msgstr "�쥹�ݥ󥹤��Хåե��򥪡��Хե��������ޤ�����"
+msgstr "レスポンスがバッファをオーバフローさせました。"
 
 #: methods/ftp.cc:362 methods/ftp.cc:374
 msgid "Protocol corruption"
-msgstr "�ץ��ȥ��뤬����Ƥ��ޤ�"
+msgstr "プロトコルが壊れています"
 
 #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
 msgid "Write error"
-msgstr "�񤭹��ߥ��顼"
+msgstr "書き込みエラー"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
-msgstr "�����åȤ�����Ǥ��ޤ���"
+msgstr "ソケットを作成できません"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr "�ǡ��������åȤ���³�Ǥ��ޤ���Ǥ�������³�������ॢ���Ȥ��ޤ�����"
+msgstr "データソケットへ接続できませんでした。接続がタイムアウトしました"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
-msgstr "��ư�����åȤ���³�Ǥ��ޤ���"
+msgstr "パッシブソケットに接続できません。"
 
 #: methods/ftp.cc:722
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo �ϥꥹ�˥󥰥ݡ��Ȥ�������뤳�Ȥ��Ǥ��ޤ���Ǥ���"
+msgstr "getaddrinfo はリスニングポートを取得することができませんでした"
 
 #: methods/ftp.cc:736
 msgid "Could not bind a socket"
-msgstr "�����åȤ� bind �Ǥ��ޤ���Ǥ���"
+msgstr "ソケットをバインドできませんでした"
 
 #: methods/ftp.cc:740
 msgid "Could not listen on the socket"
-msgstr "�����åȤ� listen �Ǥ��ޤ���Ǥ���"
+msgstr "ソケットをリスンできませんでした"
 
 #: methods/ftp.cc:747
 msgid "Could not determine the socket's name"
-msgstr "�����åȤ�̾��������Ǥ��ޤ���Ǥ�����"
+msgstr "ソケットの名前を特定できませんでした"
 
 #: methods/ftp.cc:779
 msgid "Unable to send PORT command"
-msgstr "PORT ���ޥ�ɤ������Ǥ��ޤ���"
+msgstr "PORT コマンドを送信できません"
 
 #: methods/ftp.cc:789
 #, c-format
 msgid "Unknown address family %u (AF_*)"
-msgstr "̤�ΤΥ��ɥ쥹�ե��ߥ� %u (AF_*)"
+msgstr "未知のアドレスファミリ %u (AF_*)"
 
 #: methods/ftp.cc:798
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "EPRT �˼��Ԥ��ޤ����������б���: %s"
+msgstr "EPRT に失敗しました。サーバ応答: %s"
 
 #: methods/ftp.cc:818
 msgid "Data socket connect timed out"
-msgstr "�ǡ��������å���³�����ॢ����"
+msgstr "データソケット接続タイムアウト"
 
 #: methods/ftp.cc:825
 msgid "Unable to accept connection"
-msgstr "��³�� accept �Ǥ��ޤ���"
+msgstr "接続を accept できません"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
-msgstr "�ե�����Υϥå���Ǥ�����"
+msgstr "ファイルのハッシュでの問題"
 
 #: methods/ftp.cc:877
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "�ե����뤬�����Ǥ��ޤ��󡣥����б��� '%s'"
+msgstr "ファイルを取得できません。サーバ応答 '%s'"
 
 #: methods/ftp.cc:892 methods/rsh.cc:322
 msgid "Data socket timed out"
-msgstr "�ǡ��������åȥ����ॢ����"
+msgstr "データソケットタイムアウト"
 
 #: methods/ftp.cc:922
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "�ǡ���ž���˼��Ԥ��ޤ����������б��� '%s'"
+msgstr "データ転送に失敗しました。サーバ応答 '%s'"
 
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
-msgstr "�䤤��碌"
+msgstr "問い合わせ"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
-msgstr "�¹ԤǤ��ޤ���"
+msgstr "呼び出せません"
 
 #: methods/connect.cc:64
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "%s (%s) ����³���Ƥ��ޤ�"
+msgstr "%s (%s) へ接続しています"
 
 #: methods/connect.cc:71
 #, c-format
@@ -1854,517 +1850,516 @@ msgstr "[IP: %s %s]"
 #: methods/connect.cc:80
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "%s (f=%u t=%u p=%u) ���Ф��륽���åȤ�����Ǥ��ޤ���"
+msgstr "%s (f=%u t=%u p=%u) に対するソケットを作成できません"
 
 #: methods/connect.cc:86
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "%s:%s (%s) �ؤ���³�򳫻ϤǤ��ޤ���"
+msgstr "%s:%s (%s) への接続を開始できません。"
 
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s) ����³�Ǥ��ޤ���Ǥ�������³�������ॢ���Ȥ��ޤ���"
+msgstr "%s:%s (%s) へ接続できませんでした。接続がタイムアウトしました"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "%s:%s (%s) ����³�Ǥ��ޤ���Ǥ�����"
+msgstr "%s:%s (%s) へ接続できませんでした。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
-msgstr "%s ����³���Ƥ��ޤ�"
+msgstr "%s へ接続しています"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "'%s' ����Ǥ��ޤ���Ǥ���"
+msgstr "'%s' を解決できませんでした"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "'%s' �����Ū�˲��Ǥ��ޤ���"
+msgstr "'%s' が一時的に解決できません"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "'%s:%s' (%i) �β��������꤬������ޤ���"
+msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
-msgstr "%s %s ����³�Ǥ��ޤ���:"
+msgstr "%s %s へ接続できません:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "'%s' を解決できませんでした"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。"
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "���å� %s �������Ǥ��ޤ���Ǥ���"
+msgstr "少なくとも 1 つの不正な署名が発見されました。"
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " 署名の検証 (gnupg はインストールされていますか?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "gpgv の実行中に未知のエラーが発生"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "�ʲ������̥ѥå����������󥹥ȡ��뤵��ޤ�:"
+msgstr "以下の署名が無効です:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
-msgstr ""
+msgstr "公開鍵を利用できないため、以下の署名は検証できませんでした:\n"
 
 #: methods/gzip.cc:57
 #, c-format
 msgid "Couldn't open pipe for %s"
-msgstr "%s ���Ф��ƥѥ��פ򳫤��ޤ���Ǥ���"
+msgstr "%s に対してパイプを開けませんでした"
 
 #: methods/gzip.cc:102
 #, c-format
 msgid "Read error from %s process"
-msgstr "%s �ץ�����������ɤ߹��ߥ��顼"
+msgstr "%s プロセスからの読み込みエラー"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
-msgstr "�إå����Ե���Ǥ�"
+msgstr "ヘッダの待機中です"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr "%u ʸ����ۤ��� 1 �ԤΥإå���������ޤ���"
+msgstr "%u 文字を超える 1 行のヘッダを取得しました"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
-msgstr "�����ʥإå��ԤǤ�"
+msgstr "不正なヘッダ行です"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
-msgstr "http �����Ф������ʥ�ץ饤�إå����������Ƥ��ޤ���"
+msgstr "http サーバが不正なリプライヘッダを送信してきました"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "http �����Ф������� Content-Length �إå����������Ƥ��ޤ���"
+msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "http �����Ф������� Content-Range �إå����������Ƥ��ޤ���"
+msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
-msgstr "http �����ФΥ�󥸥��ݡ��Ȥ�����Ƥ��ޤ�"
+msgstr "http サーバのレンジサポートが壊れています"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
-msgstr "���������եե����ޥåȤǤ�"
+msgstr "不明な日付フォーマットです"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
-msgstr "select �˼��Ԥ��ޤ���"
+msgstr "select に失敗しました"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
-msgstr "��³�����ॢ����"
+msgstr "接続タイムアウト"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
-msgstr "���ϥե�����ؤν񤭹��ߤǥ��顼��ȯ�����ޤ���"
+msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
-msgstr "�ե�����ؤν񤭹��ߤǥ��顼��ȯ�����ޤ���"
+msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
-msgstr "�ե�����ؤν񤭹��ߤǥ��顼��ȯ�����ޤ���"
+msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
-msgstr "��⡼��¦����³��������������ƥ����Ф�����ɤ߹��ߤ˼��Ԥ��ޤ���"
+msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
-msgstr "�����Ф�����ɤ߹��ߤ˼��Ԥ��ޤ���"
+msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
-msgstr "�����ʥإå��Ǥ�"
+msgstr "不正なヘッダです"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
-msgstr "��³����"
+msgstr "接続失敗"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
-msgstr "�������顼"
+msgstr "内部エラー"
 
 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
-msgstr "���Υե������ mmap �Ǥ��ޤ���"
+msgstr "空のファイルを mmap できません"
 
 #: apt-pkg/contrib/mmap.cc:87
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr "%lu �Х��Ȥ� mmap ���Ǥ��ޤ���Ǥ���"
+msgstr "%lu バイトの mmap ができませんでした"
 
 #: apt-pkg/contrib/strutl.cc:938
 #, c-format
 msgid "Selection %s not found"
-msgstr "���򤵤줿 %s �����Ĥ���ޤ���"
+msgstr "選択された %s が見つかりません"
 
 #: apt-pkg/contrib/configuration.cc:436
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "����Ǥ��ʤ���ά�����Ǥ�: '%c'"
+msgstr "理解できない省略形式です: '%c'"
 
 #: apt-pkg/contrib/configuration.cc:494
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "����ե����� %s �򥪡��ץ�Ǥ��ޤ���Ǥ���"
+msgstr "設定ファイル %s をオープンできませんでした"
 
 #: apt-pkg/contrib/configuration.cc:512
 #, c-format
 msgid "Line %d too long (max %d)"
-msgstr "%d ���ܤ�Ĺ�᤮�ޤ� (����� %d)"
+msgstr "%d 行目が長すぎます (最大 %d)"
 
 #: apt-pkg/contrib/configuration.cc:608
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "ʸˡ���顼 %s:%u: �֥��å���̾���ʤ��ǻϤޤäƤ��ޤ���"
+msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。"
 
 #: apt-pkg/contrib/configuration.cc:627
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "ʸˡ���顼 %s:%u: �����ʥ����Ǥ�"
+msgstr "文法エラー %s:%u: 不正なタグです"
 
 #: apt-pkg/contrib/configuration.cc:644
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "ʸˡ���顼 %s:%u: �ͤθ��;ʬ�ʥ��ߤ����äƤ��ޤ�"
+msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています"
 
 #: apt-pkg/contrib/configuration.cc:684
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "ʸˡ���顼 %s:%u: ̿��ϥȥåץ�٥�ǤΤ߼¹ԤǤ��ޤ�"
+msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます"
 
 #: apt-pkg/contrib/configuration.cc:691
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "ʸˡ���顼 %s:%u: ���󥯥롼�ɤΥͥ��Ȥ�¿�᤮�ޤ�"
+msgstr "文法エラー %s:%u: インクルードのネストが多すぎます"
 
 #: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "ʸˡ���顼 %s:%u: �������饤�󥯥롼�ɤ���Ƥ��ޤ�"
+msgstr "文法エラー %s:%u: ここからインクルードされています"
 
 #: apt-pkg/contrib/configuration.cc:704
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "ʸˡ���顼 %s:%u: ̤�б���̿�� '%s'"
+msgstr "文法エラー %s:%u: 未対応の命令 '%s'"
 
 #: apt-pkg/contrib/configuration.cc:738
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "ʸˡ���顼 %s:%u: �ե�����κǸ��;�פʥ��ߤ�����ޤ�"
+msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります"
 
 #: apt-pkg/contrib/progress.cc:154
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s... ���顼!"
+msgstr "%c%s... エラー!"
 
 #: apt-pkg/contrib/progress.cc:156
 #, c-format
 msgid "%c%s... Done"
-msgstr "%c%s... ��λ"
+msgstr "%c%s... 完了"
 
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "���ޥ�ɥ饤�󥪥ץ���� '%c' [%s ����] �������Ǥ���"
+msgstr "コマンドラインオプション '%c' [%s から] は不明です。"
 
 #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
 #: apt-pkg/contrib/cmndline.cc:122
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "���ޥ�ɥ饤�󥪥ץ���� %s ������Ǥ��ޤ���"
+msgstr "コマンドラインオプション %s を理解できません"
 
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "���ޥ�ɥ饤�󥪥ץ���� %s �� boolean �ǤϤ���ޤ���"
+msgstr "コマンドラインオプション %s は boolean ではありません"
 
 #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "���ץ���� %s �ˤϰ�����ɬ�פǤ���"
+msgstr "オプション %s には引数が必要です。"
 
 #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "���ץ���� %s: ������ܤˤ� =<��> ����ꤹ��ɬ�פ�����ޤ���"
+msgstr "オプション %s: 設定項目には =<値> を指定する必要があります。"
 
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "���ץ���� %s �ˤ� '%s' �ǤϤʤ������ΰ�����ɬ�פǤ�"
+msgstr "オプション %s には '%s' ではなく整数の引数が必要です"
 
 #: apt-pkg/contrib/cmndline.cc:268
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "���ץ���� '%s' ��Ĺ�����ޤ�"
+msgstr "オプション '%s' は長すぎます"
 
 #: apt-pkg/contrib/cmndline.cc:301
 #, c-format
 msgid "Sense %s is not understood, try true or false."
-msgstr "%s ���᤹�뤳�Ȥ��Ǥ��ޤ���true �� false ���Ƥ���������"
+msgstr "%s を解釈することができません。true か false を試してください。"
 
 #: apt-pkg/contrib/cmndline.cc:351
 #, c-format
 msgid "Invalid operation %s"
-msgstr "��������� %s"
+msgstr "不正な操作 %s"
 
 #: apt-pkg/contrib/cdromutl.cc:55
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "�ޥ���ȥݥ���� %s �� stat �Ǥ��ޤ���"
+msgstr "マウントポイント %s の状態を取得できません"
 
 #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"
-msgstr "%s ���ѹ����뤳�Ȥ��Ǥ��ޤ���"
+msgstr "%s へ変更することができません"
 
 #: apt-pkg/contrib/cdromutl.cc:190
 msgid "Failed to stat the cdrom"
-msgstr "cdrom �� stat �˼��Ԥ��ޤ���"
+msgstr "cdrom の状態を取得するのに失敗しました"
 
 #: apt-pkg/contrib/fileutl.cc:82
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "�ɤ߹������ѤΥ��å��ե����� %s �˥��å��ϻ��Ѥ��ޤ���"
+msgstr "読み込み専用のロックファイル %s にロックは使用しません"
 
 #: apt-pkg/contrib/fileutl.cc:87
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "���å��ե����� %s �򥪡��ץ�Ǥ��ޤ���"
+msgstr "ロックファイル %s をオープンできません"
 
 #: apt-pkg/contrib/fileutl.cc:105
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "nfs �ޥ���Ȥ��줿���å��ե����� %s �ˤϥ��å�����Ѥ��ޤ���"
+msgstr "nfs マウントされたロックファイル %s にはロックを使用しません"
 
 #: apt-pkg/contrib/fileutl.cc:109
 #, c-format
 msgid "Could not get lock %s"
-msgstr "���å� %s �������Ǥ��ޤ���Ǥ���"
+msgstr "ロック %s が取得できませんでした"
 
 #: apt-pkg/contrib/fileutl.cc:377
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "%s ���Ԥ��ޤ������������ˤϤ���ޤ���Ǥ���"
+msgstr "%s を待ちましたが、そこにはありませんでした"
 
 #: apt-pkg/contrib/fileutl.cc:387
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
-msgstr "�ҥץ����� %s ���������ơ�������ȿ������Ȥ�ޤ�����"
+msgstr "子プロセス %s がセグメンテーション違反を受け取りました。"
 
 #: apt-pkg/contrib/fileutl.cc:390
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "�ҥץ����� %s �����顼������ (%u) ���֤��ޤ���"
+msgstr "子プロセス %s がエラーコード (%u) を返しました"
 
 #: apt-pkg/contrib/fileutl.cc:392
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "�ҥץ����� %s ��ͽ��������λ���ޤ���"
+msgstr "子プロセス %s が予期せず終了しました"
 
 #: apt-pkg/contrib/fileutl.cc:436
 #, c-format
 msgid "Could not open file %s"
-msgstr "�ե����� %s �򥪡��ץ�Ǥ��ޤ���Ǥ���"
+msgstr "ファイル %s をオープンできませんでした"
 
 #: apt-pkg/contrib/fileutl.cc:492
 #, c-format
 msgid "read, still have %lu to read but none left"
-msgstr "�ɤ߹��ߤ� %lu �ĤäƤ���Ϥ��Ǥ���������ĤäƤ��ޤ���"
+msgstr "読み込みが %lu 残っているはずですが、何も残っていません"
 
 #: apt-pkg/contrib/fileutl.cc:522
 #, c-format
 msgid "write, still have %lu to write but couldn't"
-msgstr "���� %lu �񤭹���ɬ�פ�����ޤ������񤭹��ळ�Ȥ��Ǥ��ޤ���Ǥ���"
+msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした"
 
 #: apt-pkg/contrib/fileutl.cc:597
 msgid "Problem closing the file"
-msgstr "�ե�����Υ������������꤬ȯ�����ޤ���"
+msgstr "ファイルのクローズ中に問題が発生しました"
 
 #: apt-pkg/contrib/fileutl.cc:603
 msgid "Problem unlinking the file"
-msgstr "�ե�����κ�������꤬ȯ�����ޤ���"
+msgstr "ファイルの削除中に問題が発生しました"
 
 #: apt-pkg/contrib/fileutl.cc:614
 msgid "Problem syncing the file"
-msgstr "�ե������ sync �����꤬ȯ�����ޤ���"
+msgstr "ファイルの同期中に問題が発生しました"
 
 #: apt-pkg/pkgcache.cc:126
 msgid "Empty package cache"
-msgstr "���Υѥå���������å���"
+msgstr "空のパッケージキャッシュ"
 
 #: apt-pkg/pkgcache.cc:132
 msgid "The package cache file is corrupted"
-msgstr "�ѥå���������å���ե����뤬����Ƥ��ޤ�"
+msgstr "パッケージキャッシュファイルが壊れています"
 
 #: apt-pkg/pkgcache.cc:137
 msgid "The package cache file is an incompatible version"
-msgstr "���Υѥå���������å���ե�����ϸߴ������ʤ��С������Ǥ�"
+msgstr "このパッケージキャッシュファイルは互換性がないバージョンです"
 
 #: apt-pkg/pkgcache.cc:142
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "���� APT �ϥС�����˥󥰥����ƥ� '%s' �򥵥ݡ��Ȥ��Ƥ��ޤ���"
+msgstr "この APT はバージョニングシステム '%s' をサポートしていません"
 
 #: apt-pkg/pkgcache.cc:147
 msgid "The package cache was built for a different architecture"
-msgstr "�ѥå���������å��夬�ۤʤ륢�����ƥ������Ѥ˹��ۤ���Ƥ��ޤ�"
+msgstr "パッケージキャッシュが異なるアーキテクチャ用に構築されています"
 
 #: apt-pkg/pkgcache.cc:218
 msgid "Depends"
-msgstr "��¸"
+msgstr "依存"
 
 #: apt-pkg/pkgcache.cc:218
 msgid "PreDepends"
-msgstr "��԰�¸"
+msgstr "先行依存"
 
 #: apt-pkg/pkgcache.cc:218
 msgid "Suggests"
-msgstr "���"
+msgstr "提案"
 
 #: apt-pkg/pkgcache.cc:219
 msgid "Recommends"
-msgstr "�侩"
+msgstr "推奨"
 
 #: apt-pkg/pkgcache.cc:219
 msgid "Conflicts"
-msgstr "����"
+msgstr "競合"
 
 #: apt-pkg/pkgcache.cc:219
 msgid "Replaces"
-msgstr "�ִ�"
+msgstr "置換"
 
 #: apt-pkg/pkgcache.cc:220
 msgid "Obsoletes"
-msgstr "�ѻ�"
+msgstr "廃止"
 
 #: apt-pkg/pkgcache.cc:231
 msgid "important"
-msgstr "����"
+msgstr "重要"
 
 #: apt-pkg/pkgcache.cc:231
 msgid "required"
-msgstr "�׵�"
+msgstr "要求"
 
 #: apt-pkg/pkgcache.cc:231
 msgid "standard"
-msgstr "ɸ��"
+msgstr "標準"
 
 #: apt-pkg/pkgcache.cc:232
 msgid "optional"
-msgstr "Ǥ��"
+msgstr "任意"
 
 #: apt-pkg/pkgcache.cc:232
 msgid "extra"
-msgstr "����"
+msgstr "特別"
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 msgid "Building dependency tree"
-msgstr "��¸�ط��ĥ꡼��������Ƥ��ޤ�"
+msgstr "依存関係ツリーを作成しています"
 
 #: apt-pkg/depcache.cc:61
 msgid "Candidate versions"
-msgstr "����С������"
+msgstr "候補バージョン"
 
 #: apt-pkg/depcache.cc:90
 msgid "Dependency generation"
-msgstr "��¸�ط�������"
+msgstr "依存関係の生成"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "�ѥå������ե����� %s ���᤹�뤳�Ȥ��Ǥ��ޤ��� (1)"
+msgstr "パッケージファイル %s を解釈することができません (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "�ѥå������ե����� %s ���᤹�뤳�Ȥ��Ǥ��ޤ��� (2)"
+msgstr "パッケージファイル %s を解釈することができません (2)"
 
 #: apt-pkg/sourcelist.cc:94
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "�������ꥹ�� %2$s �� %1$lu ���ܤ������Ǥ� (URI)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)"
 
 #: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "�������ꥹ�� %2$s �� %1$lu ���ܤ������Ǥ� (dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)"
 
 #: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "�������ꥹ�� %2$s �� %1$lu ���ܤ������Ǥ� (URI parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)"
 
 #: apt-pkg/sourcelist.cc:105
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "�������ꥹ�� %2$s �� %1$lu ���ܤ������Ǥ� (absolute dist)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)"
 
 #: apt-pkg/sourcelist.cc:112
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "�������ꥹ�� %2$s �� %1$lu ���ܤ������Ǥ� (dist parse)"
+msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)"
 
 #: apt-pkg/sourcelist.cc:203
 #, c-format
 msgid "Opening %s"
-msgstr "%s �򥪡��ץ󤷤Ƥ��ޤ�"
+msgstr "%s をオープンしています"
 
 #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "�������ꥹ�� %2$s �� %1$u ���ܤ�Ĺ�᤮�ޤ���"
+msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。"
 
 #: apt-pkg/sourcelist.cc:240
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "�������ꥹ�� %2$s �� %1$u ���ܤ������Ǥ� (type)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "�������ꥹ�� %3$s �� %2$u �Ԥˤ��륿���� '%1$s' �������Ǥ�"
+msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "�������ꥹ�� %2$s �� %1$u ���ܤ������Ǥ� (vendor id)"
+msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)"
 
 #: apt-pkg/packagemanager.cc:402
 #, c-format
@@ -2373,235 +2368,245 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"���Υ��󥹥ȡ���ϡ�����/��԰�¸�Υ롼�פ������ǡ����Ū�˽��פ��Բķ�ѥ�"
-"������ %s �������ޤ��������¿���ξ������꤬�����븶���Ȥʤ�ޤ���������"
-"�����Ԥ������ʤ顢APT::Force-LoopBreak ���ץ�����ͭ���ˤ��Ƥ���������"
+"このインストールは、競合/先行依存のループが原因で、一時的に重要な不可欠パッ"
+"ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
+"これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
 
 #: apt-pkg/pkgrecords.cc:37
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "����ǥå����ե�����Υ����� '%s' �ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+msgstr "インデックスファイルのタイプ '%s' はサポートされていません"
 
 #: apt-pkg/algorithms.cc:241
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"�ѥå����� %s ��ƥ��󥹥ȡ��뤹��ɬ�פ�����ޤ��������Τ���Υ��������֤�"
-"�Ĥ��뤳�Ȥ��Ǥ��ޤ���Ǥ�����"
+"パッケージ %s を再インストールする必要がありますが、そのためのアーカイブを見"
+"つけることができませんでした。"
 
 #: apt-pkg/algorithms.cc:1059
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
-"���顼��pkgProblemResolver::Resolve ����ߤ��ޤ����������餯�ѹ��ػߥѥå���"
-"���������Ǥ���"
+"エラー、pkgProblemResolver::Resolve は停止しました。おそらく変更禁止パッケー"
+"ジが原因です。"
 
 #: apt-pkg/algorithms.cc:1061
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "������褹�뤳�Ȥ��Ǥ��ޤ��󡣲��줿�ѹ��ػߥѥå�����������ޤ���"
+msgstr "問題を解決することができません。壊れた変更禁止パッケージがあります。"
 
 #: apt-pkg/acquire.cc:62
 #, c-format
 msgid "Lists directory %spartial is missing."
-msgstr "�ꥹ�ȥǥ��쥯�ȥ� %spartial �����Ĥ���ޤ���"
+msgstr "リストディレクトリ %spartial が見つかりません。"
 
 #: apt-pkg/acquire.cc:66
 #, c-format
 msgid "Archive directory %spartial is missing."
-msgstr "���������֥ǥ��쥯�ȥ� %spartial �����Ĥ���ޤ���"
+msgstr "アーカイブディレクトリ %spartial が見つかりません。"
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "ファイルをダウンロードしています %li/%li (残り %s)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "ファイルリストを読み込んでいます"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr "�᥽�åɥɥ饤�� %s �����Ĥ���ޤ���"
+msgstr "メソッドドライバ %s が見つかりません。"
 
 #: apt-pkg/acquire-worker.cc:162
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "�᥽�å� %s ������˳��Ϥ��ޤ���Ǥ���"
+msgstr "メソッド %s が正常に開始しませんでした"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, 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:120
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "�ѥå������󥰥����ƥ� '%s' �ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+msgstr "パッケージングシステム '%s' はサポートされていません"
 
 #: apt-pkg/init.cc:136
 msgid "Unable to determine a suitable packaging system type"
-msgstr "Ŭ�ڤʥѥå����������ƥॿ���פ�����Ǥ��ޤ���"
+msgstr "適切なパッケージシステムタイプを特定できません"
 
 #: apt-pkg/clean.cc:61
 #, c-format
 msgid "Unable to stat %s."
-msgstr "%s �� stat �Ǥ��ޤ���"
+msgstr "%s の状態を取得できません。"
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "sources.list �� '������' URI ����ꤹ��ɬ�פ�����ޤ�"
+msgstr "sources.list に 'ソース' URI を指定する必要があります"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"�ѥå������ꥹ�Ȥޤ��ϥ��ơ������ե��������ޤ��ϥ����ץ󤹤뤳�Ȥ��Ǥ���"
-"����"
+"パッケージリストまたはステータスファイルを解釈またはオープンすることができま"
+"せん。"
 
 #: apt-pkg/cachefile.cc:77
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
-"������������褹�뤿��ˤ� apt-get update ��¹Ԥ���ɬ�פ����뤫�⤷���"
-"����"
+"これらの問題を解決するためには apt-get update を実行する必要があるかもしれま"
+"せん"
 
 #: apt-pkg/policy.cc:269
 msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
-"�����ʥ쥳���ɤ� preferences �ե������¸�ߤ��ޤ����ѥå������إå�������ޤ�"
-"��"
+"不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ"
+"ん"
 
 #: apt-pkg/policy.cc:291
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "pin ������ %s ������Ǥ��ޤ���Ǥ���"
+msgstr "pin タイプ %s が理解できませんでした"
 
 #: apt-pkg/policy.cc:299
 msgid "No priority (or zero) specified for pin"
-msgstr "pin ��ͥ���� (�ޤ��� 0) �����ꤵ��Ƥ��ޤ���"
+msgstr "pin で優先度 (または 0) が指定されていません"
 
 #: apt-pkg/pkgcachegen.cc:74
 msgid "Cache has an incompatible versioning system"
-msgstr "����å������ߴ��ʥС�����˥󥰥����ƥब����ޤ�"
+msgstr "キャッシュに非互換なバージョニングシステムがあります"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (NewPackage)"
+msgstr "%s を処理中にエラーが発生しました (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (UsePackage1)"
+msgstr "%s を処理中にエラーが発生しました (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (UsePackage2)"
+msgstr "%s を処理中にエラーが発生しました (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (NewFileVer1)"
+msgstr "%s を処理中にエラーが発生しました (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (NewVersion1)"
+msgstr "%s を処理中にエラーが発生しました (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (UsePackage3)"
+msgstr "%s を処理中にエラーが発生しました (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, 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."
-msgstr "���� APT ���б����Ƥ���ʾ�ο��Υѥå����������ꤵ��ޤ�����"
+msgstr "この APT が対応している以上の数のパッケージが指定されました。"
 
 #: apt-pkg/pkgcachegen.cc:210
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "���� APT ���б����Ƥ���ʾ�ο��ΥС�������׵ᤵ��ޤ�����"
+msgstr "この APT が対応している以上の数のバージョンが要求されました。"
 
 #: apt-pkg/pkgcachegen.cc:213
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "���� APT ���б����Ƥ���ʾ�ο��ΰ�¸�ط���ȯ�����ޤ�����"
+msgstr "この APT が対応している以上の数の依存関係が発生しました。"
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (FindPkg)"
+msgstr "%s を処理中にエラーが発生しました (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "%s �������˥��顼��ȯ�����ޤ��� (CollectFileProvides)"
+msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
-msgstr "�ѥå����� %s %s ���ե������¸�ν�����˸��Ĥ���ޤ���Ǥ���"
+msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした"
 
 #: apt-pkg/pkgcachegen.cc:574
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "�������ѥå������ꥹ�� %s �� stat �Ǥ��ޤ���"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
 
 #: apt-pkg/pkgcachegen.cc:658
 msgid "Collecting File Provides"
-msgstr "�ե������󶡾����������Ƥ��ޤ�"
+msgstr "ファイル提供情報を収集しています"
 
 #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 msgid "IO Error saving source cache"
-msgstr "����������å������¸��� IO ���顼��ȯ�����ޤ���"
+msgstr "ソースキャッシュの保存中に IO エラーが発生しました"
 
 #: apt-pkg/acquire-item.cc:126
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
-msgstr "��͡���˼��Ԥ��ޤ�����%s (%s -> %s)"
+msgstr "名前の変更に失敗しました。%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
-msgstr "MD5Sum ��Ŭ�礷�ޤ���"
+msgstr "MD5Sum が適合しません"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"�ѥå����� %s �Υե�����ΰ��֤�����Ǥ��ޤ��󡣤����餯���Υѥå��������ư"
-"�ǽ�������ɬ�פ�����ޤ� (¸�ߤ��ʤ��������ƥ�����Τ���)��"
+"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
+"で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
-"�ѥå����� %s �Υե�����ΰ��֤�����Ǥ��ޤ��󡣤����餯���Υѥå��������ư"
-"�ǽ�������ɬ�פ�����ޤ���"
+"パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
+"で修正する必要があります。"
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"�ѥå���������ǥå����ե����뤬����Ƥ��ޤ����ѥå����� %s �� Filename: "
-"�ե�����ɤ�����ޤ���"
+"パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
+"フィールドがありません。"
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
-msgstr "��������Ŭ�礷�ޤ���"
+msgstr "サイズが適合しません"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "�٥���֥��å� %s �ϥե��󥬡��ץ��Ȥ�ޤ�Ǥ��ޤ���"
+msgstr "ベンダブロック %s はフィンガープリントを含んでいません"
 
 #: apt-pkg/cdrom.cc:507
 #, c-format
@@ -2609,50 +2614,50 @@ msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"CD-ROM �ޥ���ȥݥ���� %s ����Ѥ��ޤ�\n"
-"CD-ROM ��ޥ���Ȥ��Ƥ��ޤ�\n"
+"CD-ROM マウントポイント %s を使用します\n"
+"CD-ROM をマウントしています\n"
 
 #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
 msgid "Identifying.. "
-msgstr "��ǧ���Ƥ��ޤ�.. "
+msgstr "確認しています.. "
 
 #: apt-pkg/cdrom.cc:541
 #, c-format
 msgid "Stored label: %s \n"
-msgstr "��Ǽ���줿��٥�: %s \n"
+msgstr "格納されたラベル: %s \n"
 
 #: apt-pkg/cdrom.cc:561
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "CD-ROM �ޥ���ȥݥ���� %s ����Ѥ��ޤ�\n"
+msgstr "CD-ROM マウントポイント %s を使用します\n"
 
 #: apt-pkg/cdrom.cc:579
 msgid "Unmounting CD-ROM\n"
-msgstr "CD-ROM �򥢥�ޥ���Ȥ��Ƥ��ޤ�\n"
+msgstr "CD-ROM をアンマウントしています\n"
 
 #: apt-pkg/cdrom.cc:583
 msgid "Waiting for disc...\n"
-msgstr "�ǥ��������ԤäƤ��ޤ�...\n"
+msgstr "ディスクを待っています ...\n"
 
 #. Mount the new CDROM
 #: apt-pkg/cdrom.cc:591
 msgid "Mounting CD-ROM...\n"
-msgstr "CD-ROM ��ޥ���Ȥ��Ƥ��ޤ�...\n"
+msgstr "CD-ROM をマウントしています ...\n"
 
 #: apt-pkg/cdrom.cc:609
 msgid "Scanning disc for index files..\n"
-msgstr "�ǥ������Υ���ǥå����ե�������������Ƥ��ޤ�..\n"
+msgstr "ディスクのインデックスファイルを走査しています ..\n"
 
 #: apt-pkg/cdrom.cc:647
 #, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr ""
-"%i �Υѥå���������ǥå�����%i �Υ���������ǥå�����%i �ν�̾�򸫤Ĥ��ޤ�"
-"��\n"
+"%i のパッケージインデックス、%i のソースインデックス、%i の署名を見つけまし"
+"た\n"
 
 #: apt-pkg/cdrom.cc:710
 msgid "That is not a valid name, try again.\n"
-msgstr "�����ͭ����̾���ǤϤ���ޤ��󡣺ƻ�Ԥ��Ƥ���������\n"
+msgstr "これは有効な名前ではありません。再試行してください。\n"
 
 #: apt-pkg/cdrom.cc:726
 #, c-format
@@ -2660,100 +2665,109 @@ msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
-"���Υǥ������ϰʲ��Τ褦�˸ƤФ�ޤ�: \n"
+"このディスクは以下のように呼ばれます: \n"
 "'%s'\n"
 
 #: apt-pkg/cdrom.cc:730
 msgid "Copying package lists..."
-msgstr "�ѥå������ꥹ�Ȥ򥳥ԡ����Ƥ��ޤ�..."
+msgstr "パッケージリストをコピーしています ..."
 
 #: apt-pkg/cdrom.cc:754
 msgid "Writing new source list\n"
-msgstr "�������������ꥹ�Ȥ�񤭹���Ǥ��ޤ�\n"
+msgstr "新しいソースリストを書き込んでいます\n"
 
 #: apt-pkg/cdrom.cc:763
 msgid "Source list entries for this disc are:\n"
-msgstr "���Υǥ������Υ������ꥹ�ȤΥ���ȥ�:\n"
+msgstr "このディスクのソースリストのエントリ:\n"
 
 #: apt-pkg/cdrom.cc:803
 msgid "Unmounting CD-ROM..."
-msgstr "CD-ROM �򥢥�ޥ���Ȥ��Ƥ��ޤ�..."
+msgstr "CD-ROM をアンマウントしています ..."
 
 #: apt-pkg/indexcopy.cc:261
 #, c-format
 msgid "Wrote %i records.\n"
-msgstr "%i �쥳���ɤ�񤭹��ߤޤ�����\n"
+msgstr "%i レコードを書き込みました。\n"
 
 #: apt-pkg/indexcopy.cc:263
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i �쥳���ɤ�񤭹��ߤޤ�����%i �ĤΥե����뤬¸�ߤ��ޤ���\n"
+msgstr "%i レコードを書き込みました。%i 個のファイルが存在しません。\n"
 
 #: apt-pkg/indexcopy.cc:266
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i �쥳���ɤ�񤭹��ߤޤ�����%i �Ĥ�Ŭ�礷�ʤ��ե����뤬����ޤ���\n"
+msgstr "%i レコードを書き込みました。%i 個の適合しないファイルがあります。\n"
 
 #: apt-pkg/indexcopy.cc:269
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"%i �쥳���ɤ�񤭹��ߤޤ�����%i �ĤΥե����뤬���Ĥ��餺��%i �Ĥ�Ŭ�礷�ʤ�"
-"�ե����뤬����ޤ���\n"
+"%i レコードを書き込みました。%i 個のファイルが見つからず、%i 個の適合しない"
+"ファイルがあります。\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "%s �򥪡��ץ󤷤Ƥ��ޤ�"
+msgstr "%s を準備しています"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "%s �򥪡��ץ󤷤Ƥ��ޤ�"
+msgstr "%s を展開しています"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "����ե����� %s �򥪡��ץ�Ǥ��ޤ���Ǥ���"
+msgstr "%s の設定を準備しています"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "%s ����³���Ƥ��ޤ�"
+msgstr "%s を設定しています"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  ���󥹥ȡ��뤵��Ƥ���С������: "
+msgstr "%s をインストールしました"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%s の削除を準備しています"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "%s �򥪡��ץ󤷤Ƥ��ޤ�"
+msgstr "%s を削除しています"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "�侩"
+msgstr "%s を削除しました"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "%s の設定を準備しています"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "%s の削除に失敗しました"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
-msgstr "�������³��������������ޤ���"
+msgstr "途中で接続がクローズされました"
+
+#~ msgid "Reading file list"
+#~ msgstr "ファイルリストを読み込んでいます"
+
+#~ msgid "Could not execute "
+#~ msgstr "実行できませんでした:"
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "設定 %s の削除を準備しています"
 
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "�������ꥹ�� %3$s �� %2$u �Ԥ������ʥ٥�� ID '%1$s' ������ޤ�"
+#~ msgid "Removed with config %s"
+#~ msgstr "設定 %s を削除しました"
diff --git a/po/ko.po b/po/ko.po
index 7f6636c8f..37648f72b 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\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"
@@ -143,14 +143,14 @@ msgstr "  버전 테이블:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s (%s %s), 컴파일 시각 %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -517,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s의 정보를 읽는 데 실패했습니다"
@@ -631,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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"
@@ -712,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "내려받기 디렉토리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "소스 목록을 읽을 수 없습니다."
 
-#: cmdline/apt-get.cc: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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -864,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "일부 파일을 받는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -893,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"
@@ -945,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "update 명령은 인수를 받지 않습니다"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "목록 디렉토리를 잠글 수 없습니다"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -995,26 +995,26 @@ msgstr ""
 "일부 인덱스 파일을 내려받는 데 실패했습니다. 해당 파일을 무시하거나 과거의 버"
 "전을 대신 사용합니다."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s 꾸러미를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1022,7 +1022,7 @@ msgstr ""
 "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
 "(아니면 해결 방법을 지정하십시오)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1033,7 +1033,7 @@ msgstr ""
 "불안정 배포판을 사용해서 일부 필요한 꾸러미를 아직 만들지 않았거나,\n"
 "아직 Incoming에서 나오지 않은 경우일 수도 있습니다."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1042,115 +1042,120 @@ msgstr ""
 "한 가지 작업만을 요청하셨으므로, 아마도 이 꾸러미를 설치할 수\n"
 "없는 경우일 것이고 이 꾸러미에 버그 보고서를 제출해야 합니다."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "망가진 꾸러미"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "다음 꾸러미를 더 설치할 것입니다:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "제안하는 꾸러미:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "추천하는 꾸러미:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "업그레이드를 계산하는 중입니다... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "실패"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "완료"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "해당되는 소스 꾸러미를 가져올 꾸러미를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s의 소스 꾸러미를 찾을 수 없습니다"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s에 충분한 공간이 없습니다"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s 소스를 가져옵니다\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "일부 아카이브를 가져오는 데 실패했습니다."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "압축 풀기 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "빌드 명령 '%s' 실패.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "하위 프로세스가 실패했습니다"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr "해당되는 빌드 의존성을 검사할 꾸러미를 최소한 하나 지정해야 합니다"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 꾸러미에 빌드 의존성이 없습니다.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1159,7 +1164,7 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미를 찾을 수 없습니"
 "다"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1168,32 +1173,32 @@ msgstr ""
 "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 꾸러미의 사용 가능한 버"
 "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는 데 실패했습니다"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1546,7 +1551,7 @@ msgstr "관리 디렉토리를 %sinfo로 바꾸는 데 실패했습니다"
 msgid "Internal error getting a package name"
 msgstr "꾸러미 이름을 가져오는 데 내부 오류"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "파일 목록을 읽는 중입니다"
 
@@ -1592,10 +1597,6 @@ msgstr "diversion을 추가하는 데 내부 오류"
 msgid "The pkg cache must be initialized first"
 msgstr "꾸러미 캐시를 먼저 초기화해야 합니다"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "파일 목록을 읽는 중"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1669,12 +1670,12 @@ msgstr "파일이 없습니다"
 msgid "File not found"
 msgstr "파일이 없습니다"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "파일 정보를 읽는 데 실패했습니다"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "파일 변경 시각을 설정하는 데 실패했습니다"
 
@@ -1802,7 +1803,7 @@ msgstr "데이터 소켓 연결 시간 초과"
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
@@ -1825,7 +1826,7 @@ msgstr "데이터 전송 실패, 서버에서는: %s"
 msgid "Query"
 msgstr "질의"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "다음을 실행할 수 없습니다: "
 
@@ -1854,71 +1855,71 @@ msgstr "%s:%s에 연결을 초기화할 수 없습니다 (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "%s:%s에 연결할 수 없습니다 (%s). 연결 제한 시간이 초과했습니다"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "%s:%s에 연결할 수 없습니다 (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s에 연결하는 중입니다"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "'%s'의 주소를 알아낼 수 없습니다"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "%s %s에 연결할 수 없습니다:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "'%s'의 주소를 알아낼 수 없습니다"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "%s 잠금 파일을 얻을 수 없습니다"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "다음 꾸러미를 더 설치할 것입니다:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1934,76 +1935,76 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
 msgid "Read error from %s process"
 msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "헤더를 기다리는 중입니다"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "헤더 줄이 잘못되었습니다"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP 서버에서 잘못된 응답 헤더를 보냈습니다"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP 서버에서 잘못된 Content-Length 헤더를 보냈습니다"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP 서버에서 잘못된 Content-Range 헤더를 보냈습니다"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "데이터 형식을 알 수 없습니다"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "select가 실패했습니다"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "연결 시간이 초과했습니다"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "서버에서 읽는 데 오류가 발생했습니다"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "내부 오류"
 
@@ -2294,12 +2295,12 @@ msgstr "후보 버전"
 msgid "Dependency generation"
 msgstr "의존성 만들기"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "꾸러미 파일 %s 파일을 파싱할 수 없습니다 (2)"
@@ -2399,11 +2400,18 @@ msgstr "목록 디렉토리 %spartial이 빠졌습니다."
 msgid "Archive directory %spartial is missing."
 msgstr "아카이브 디렉토리 %spartial이 빠졌습니다."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "파일 목록을 읽는 중입니다"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2545,11 +2553,15 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다
 msgid "rename failed, %s (%s -> %s)."
 msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum이 맞지 않습니다"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2558,7 +2570,7 @@ msgstr ""
 "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
 "니다. (아키텍쳐가 빠졌기 때문입니다)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2567,14 +2579,14 @@ msgstr ""
 "%s 꾸러미의 파일을 찾을 수 없습니다. 수동으로 이 꾸러미를 고쳐야 할 수도 있습"
 "니다."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "꾸러미 인덱스 파일이 손상되었습니다. %s 꾸러미에 Filename: 필드가 없습니다."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
@@ -2718,15 +2730,22 @@ msgid "Removed %s"
 msgstr "추천"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "설정 파일 %s 파일을 여는 중입니다"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "%s을(를) 지우는 데 실패했습니다"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "연결이 너무 빨리 끊어졌습니다"
+
+#~ msgid "Reading file list"
+#~ msgstr "파일 목록을 읽는 중"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "%s 잠금 파일을 얻을 수 없습니다"
diff --git a/po/makefile b/po/makefile
index 6ad6997c0..45e5b1e5a 100644
--- a/po/makefile
+++ b/po/makefile
@@ -62,11 +62,11 @@ $(MOFILES) : $(PO_DOMAINS)/%.mo : $(PO_DOMAINS)/%.po
 stats:
 	for i in *.pot *.po; do echo -n "$$i: "; msgfmt --statistics $$i; done
 
-binary: $(POTFILES) $(PACKAGE)-all.pot $(MOFILES) update-po
+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 a7be002f5..01c09f9cf 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-02-09 10:45+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.ui.no>\n"
@@ -160,14 +160,14 @@ msgstr "  Versjonstabell:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert p� %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -535,7 +535,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa p� %s B er n�dd.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikke � f� statusen p� %s"
@@ -649,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regul�rt uttrykk - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
 msgid "The following packages have unmet dependencies:"
 msgstr "F�lgende 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 "F�lgende NYE pakker vil bli installert:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "F�lgende pakker vil bli FJERNET:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "F�lgende pakker er holdt tilbake:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "F�lgende pakker vil bli oppgradert:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 msgstr "F�lgende pakker vil bli NEDGRADERT:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "F�lgende 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"
@@ -730,145 +730,145 @@ msgstr ""
 "ADVARSEL: F�lgende kjernepakker vil bli fjernet\n"
 "Dette b�r IKKE gj�res, med mindre du vet n�yaktig hva du gj�r!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 " Utf�rt"
 
-#: 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 kj�re �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 - Pr�v �-f�."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ADVARSEL: F�lgende pakker ble ikke autentisert!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc: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 sl�tt 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 n�r avledningen ble lagt til"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke � l�se nedlastingsmappa"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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, gj�r 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"
@@ -879,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "Nedlasting fullf�rt med innstillinga �bare nedlasting�"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -908,48 +908,48 @@ msgstr ""
 "Klarte ikke � hente alle arkivene. Du kan pr�ve med �apt-get update� eller "
 "�--fix-missing�."
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "�--fix-missing� og bytte av media st�ttes n� ikke"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc: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 ""
 "Omg�r %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"
@@ -960,49 +960,49 @@ msgstr ""
 "Dette kan bety at pakken mangler, er utg�tt, eller bare finnes \n"
 "tilgjengelig fra en annen kilde.\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr "F�lgende 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Oppdaterings-kommandoen tar ingen argumenter"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Kan ikke l�se listemappa"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1010,25 +1010,25 @@ msgstr ""
 "Klarte ikke � laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
 "ble brukt isteden. "
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil - �AllUpgrade� �dela noe"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke � finne pakken %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, velger %s istedenfor det regul�re uttrykket �%s�\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du vil kanskje utf�re �apt-get -f install� for � rette p� disse:"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1036,7 +1036,7 @@ msgstr ""
 "Uinnfridde avhengighetsforhold. Pr�v �apt-get -f install� uten pakker (eller "
 "angi en l�sning)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "at visse kjernepakker enn� ikke er laget eller flyttet ut av �Incoming� for\n"
 "distribusjonen."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1058,122 +1058,127 @@ msgstr ""
 "at pakken helt enkelt ikke kan installeres, og du b�r fylle ut en "
 "feilmelding."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "F�lgende informasjon kan v�re til hjelp med � l�se problemet:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "�delagte pakker"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "F�lgende ekstra pakker vil bli installert."
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Foresl�tte pakker:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Anbefalte pakker"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Beregner oppgradering... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Mislyktes"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Utf�rt"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil - �AllUpgrade� �dela noe"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke � finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omg�r utpakking av allerede utpakket kilde i %s\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger � skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke � skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omg�r utpakking av allerede utpakket kilde i %s\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen �%s� mislyktes.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen �%s� mislyktes.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1182,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke � tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke � tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke � behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "St�ttede moduler:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1563,7 +1568,7 @@ msgstr "Klarte ikke � bytte til adminkatalogen %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Intern feil ved henting av pakkenavn"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Les filliste"
 
@@ -1610,10 +1615,6 @@ msgstr "Det oppsto en intern feil n�r avledningen ble lagt til"
 msgid "The pkg cache must be initialized first"
 msgstr "Pakkelageret m� klargj�res f�rst"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Leser filliste"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1690,12 +1691,12 @@ msgstr "Fant ikke fila"
 msgid "File not found"
 msgstr "Fant ikke fila"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Klarte ikke � f� status"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Klarte ikke � sette endringstidspunkt"
 
@@ -1823,7 +1824,7 @@ msgstr "Tidsavbrudd p� tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke � godta tilkoblingen"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
@@ -1846,7 +1847,7 @@ msgstr "Dataoverf�ringen mislykkes, tjeneren sa �%s�"
 msgid "Query"
 msgstr "Sp�rring"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Klarte ikke � starte"
 
@@ -1875,71 +1876,71 @@ msgstr "Klarte ikke � starte forbindelsen til %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Klarte ikke � koble til %s:%s (%s), tidsavbrudd p� forbindelsen"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikke � koble til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kobler til %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikke � sl� opp �%s�"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig feil ved oppslag av �%s�"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Noe galt skjedde ved oppslag av �%s:%s� (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikke � koble til %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Klarte ikke � sl� opp �%s�"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "F�r ikke l�st %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "F�lgende ekstra pakker vil bli installert."
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1955,76 +1956,76 @@ msgstr "Klarte ikke � �pne r�r for %s"
 msgid "Read error from %s process"
 msgstr "Lesefeil fra %s-prosessen"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Venter p� hoder"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fikk en enkel hodelinje over %u tegn"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "�delagt hodelinje"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig �Content-Length�-hode"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig �Content-Range�-hode"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har �delagt st�tte for omr�de"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Utvalget mislykkes"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Tidsavbrudd p� forbindelsen"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "�delagte hodedata"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2315,12 +2316,12 @@ msgstr "Versjons-kandidater"
 msgid "Dependency generation"
 msgstr "Oppretter avhengighetsforhold"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarer ikke � fortolke pakkefila %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke � fortolke pakkefila %s (2)"
@@ -2420,11 +2421,18 @@ msgstr "Listemappa %spartial mangler."
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivmappa %spartial mangler."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2568,11 +2576,15 @@ msgstr "IO-feil ved lagring av kildekode-lager"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "klarte ikke � endre navnet, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5sum"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2581,7 +2593,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2590,13 +2602,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:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Feil st�rrelse"
 
@@ -2740,18 +2752,25 @@ msgid "Removed %s"
 msgstr "Anbefaler"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "�pner oppsettsfila %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Klarte ikke � fjerne %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
+#~ msgid "Reading file list"
+#~ msgstr "Leser filliste"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "F�r ikke l�st %s"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Ukjent selger ID �%s� i linje %u i kildelista %s"
diff --git a/po/nl.po b/po/nl.po
index c69254389..ef3c6acbf 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-02-10 17:35+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -146,14 +146,14 @@ msgstr "  Versietabel:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s voor %s %s gecompileerd op %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -525,7 +525,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Ontlinklimiet van %sB is bereikt.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Status opvragen van %s is mislukt"
@@ -639,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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 ge�nstalleerd"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
 #, c-format
 msgid "but %s is to be installed"
 msgstr "maar %s zal ge�nstalleerd worden"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc: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 ge�nstalleerd"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not going to be installed"
 msgstr "maar het zal niet ge�nstalleerd worden"
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc: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 ge�nstalleerd 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"
@@ -720,145 +720,145 @@ msgstr ""
 "WAARSCHUWING: De volgende essenti�le pakketten zullen verwijderd worden\n"
 "Dit dient NIET gedaan te worden tenzij u echt weet wat u doet!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu nieuwe pakketten ge�nstalleerd, "
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu opnieuw ge�nstalleerd, "
 
-#: 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 ge�nstalleerd 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Kon de ophaalmap niet vergrendelen"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -869,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -898,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 ge�nstalleerd 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 ge�nstalleerd, 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 " [Ge�nstalleerd]"
 
-#: 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"
@@ -951,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "De 'update'-opdracht aanvaard geen argumenten"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Kon de lijst-map niet vergrendelen"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1002,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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kon pakket %s niet vinden"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1030,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:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1041,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1051,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:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "De volgende informatie helpt u mogelijk verder:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Niet-werkende pakketten:"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "De volgende extra pakketten zullen ge�nstalleerd worden:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Voorgestelde pakketten:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Aanbevolen pakketten:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Opwaardering wordt doorgerekend... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Klaar"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kan geen bronpakket vinden voor %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Moet %sB aan bronarchieven ophalen.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Ophalen bron %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Ophalen van sommige archieven is mislukt."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uitpakopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Bouwopdracht '%s' is mislukt.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Dochterproces is mislukt"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1172,7 +1177,7 @@ msgstr ""
 "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
 "onvindbaar is"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1181,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:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Voldoen van Vereiste %s van pakket %s is mislukt: ge�nstalleerde versie %s "
 "is te nieuw"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bouwvereisten voor %s konden niet voldaan worden."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1571,7 +1576,7 @@ msgstr "Verspringen naar de beheermap %sinfo is mislukt"
 msgid "Internal error getting a package name"
 msgstr "Interne fout bij het ophalen van de pakketnaam"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Bestandslijst worden ingelezen"
 
@@ -1618,10 +1623,6 @@ msgstr "Interne fout bij het toevoegen van een omleiding"
 msgid "The pkg cache must be initialized first"
 msgstr "De pakketcache dient eerst ge�nitialiseerd te zijn"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Bestandslijst wordt ingelezen"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1698,12 +1699,12 @@ msgstr "Bestand niet gevonden"
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Status opvragen is mislukt"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Instellen van de aanpassingstijd is mislukt"
 
@@ -1831,7 +1832,7 @@ msgstr "Datasocket verbinding is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
@@ -1854,7 +1855,7 @@ msgstr "Data transfer is mislukt, server zei: %s"
 msgid "Query"
 msgstr "Zoekopdracht"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Aanroepen mislukt van "
 
@@ -1883,71 +1884,71 @@ msgstr "Kan de verbinding met %s:%s (%s) niet aangaan."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kon niet verbinden met %s:%s (%s), de verbinding verliep"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kon niet verbinden met %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Er wordt verbinding gemaakt met %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kon '%s' niet vinden"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tijdelijke fout bij het opzoeken van '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Kan niet verbinden met %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Kon '%s' niet vinden"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Kon vergrendeling %s niet verkrijgen"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "De volgende extra pakketten zullen ge�nstalleerd worden:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1963,79 +1964,79 @@ msgstr "Kon geen pijp openen voor %s"
 msgid "Read error from %s process"
 msgstr "Leesfout door proces %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Wachtend op de kopteksten"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Foute koptekstregel"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Er is door de HTTP server een ongeldige 'reply'-koptekst verstuurd"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Length'-koptekst verstuurd"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 "Er is door de HTTP server een ongeldige 'Content-Range'-koptekst verstuurd"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Onbekend datumformaat"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Selectie is mislukt"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Verbinding verliep"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Interne fout"
 
@@ -2333,12 +2334,12 @@ msgstr "Kandidaat-versies"
 msgid "Dependency generation"
 msgstr "Generatie vereisten"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kon pakketbestand %s niet ontleden (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kon pakketbestand %s niet ontleden (2)"
@@ -2440,11 +2441,18 @@ msgstr "Lijstmap %spartial is afwezig."
 msgid "Archive directory %spartial is missing."
 msgstr "Archiefmap %spartial is afwezig."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Bestandslijst worden ingelezen"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2592,11 +2600,15 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakketcache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "hernoeming is mislukt, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum komt niet overeen"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2605,7 +2617,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2614,7 +2626,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:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2622,7 +2634,7 @@ msgstr ""
 "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor "
 "pakket %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Grootte komt niet overeen"
 
@@ -2768,18 +2780,25 @@ msgid "Removed %s"
 msgstr "Aanbevelingen"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Configuratiebestand %s wordt geopend"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Verwijderen van %s is mislukt"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Verbinding werd voortijdig afgebroken"
 
+#~ msgid "Reading file list"
+#~ msgstr "Bestandslijst wordt ingelezen"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Kon vergrendeling %s niet verkrijgen"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Onbekende verkopers-ID '%s' op regel %u in bronlijst %s"
diff --git a/po/nn.po b/po/nn.po
index 55c044cbe..372f6be39 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: H�vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -149,14 +149,14 @@ msgstr "  Versjonstabell:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert p� %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -519,7 +519,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa p� %sB er n�dd.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikkje f� status til %s"
@@ -633,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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 "F�lgjande 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 l�t 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 f�lgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "Dei f�lgjande pakkane vil verta FJERNA:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "Dei f�lgjande pakkane er haldne tilbake:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "Dei f�lgjande pakkane vil verta oppgraderte:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei f�lgjande pakkane vil verta NEDGRADERTE:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "Dei f�lgjande pakkane som er haldne tilbake vil verta endra:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc: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"
@@ -714,146 +714,146 @@ msgstr ""
 "�TVARING: Dei f�lgjande n�dvendige pakkane vil verta fjerna.\n"
 "Dette b�r IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 pr�va � retta p� desse ved � k�yra �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. Pr�v 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 sl�tt 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje l�sa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -864,28 +864,28 @@ msgstr ""
 "For � halda fram, m� du skriva n�yaktig �%s�.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -893,49 +893,49 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan pr�va med �apt-get update� eller "
 "�--fix-missing�."
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "�--fix-missing� og byte av medium er ikkje st�tta for tida"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc: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� f�r 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"
@@ -946,49 +946,49 @@ msgstr ""
 "av ein annan pakke. Dette tyder at pakket manglar, er gjort overfl�dig\n"
 "eller er berre tilgjengeleg fr� ei anna kjelde\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr "Dei f�lgjande pakkane kan brukast i staden:"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc: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� f�r.\n"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utg�va �%s� av �%s�"
 
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc: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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Klarte ikkje l�sa listekatalogen"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -996,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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Merk, vel %s i staden for regex �%s�\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Du vil kanskje pr�va � retta p� desse ved � k�yra �apt-get -f install�."
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1023,7 +1023,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan pr�va �apt-get -f install� (eller velja "
 "ei l�ysing)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1035,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1045,122 +1045,127 @@ msgstr ""
 "pakken rett og slett ikkje l�t seg installera. I s�fall b�r du senda\n"
 "feilmelding."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "F�lgjande informasjon kan hjelpa med � l�ysa situasjonen:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "�ydelagde pakkar"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "F�resl�tte pakkar:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Tilr�dde pakkar"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Ferdig"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr� f�r i %s\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "M� henta %sB/%sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "M� henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr� f�r i %s\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen �%s� mislukkast.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1169,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "St�tta modular:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1547,7 +1552,7 @@ msgstr "Klarte ikkje byta til adminkatalogen %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Intern feil ved henting av pakkenamn"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Les filliste"
 
@@ -1594,10 +1599,6 @@ msgstr "Intern feil ved tilleggjing av avleiing"
 msgid "The pkg cache must be initialized first"
 msgstr "Pakkelageret m� f�rst klargjerast"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Les filliste"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1673,12 +1674,12 @@ msgstr "Fann ikkje fila"
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Klarte ikkje f� status"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
@@ -1806,7 +1807,7 @@ msgstr "Tidsavbrot p� tilkopling til datasokkel"
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
@@ -1829,7 +1830,7 @@ msgstr "Dataoverf�ringa mislukkast, tenaren sa �%s�"
 msgid "Query"
 msgstr "Sp�rjing"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
@@ -1858,71 +1859,71 @@ msgstr "Klarte ikkje initiera sambandet til %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Klarte ikkje kopla til %s:%s (%s), tidsavbrot p� sambandet"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Klarte ikkje kopla til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Klarte ikkje sl� opp �%s�"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Mellombels feil ved oppslag av �%s�"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Det hende noko dumt ved oppslag av �%s:%s� (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Klarte ikkje sl� opp �%s�"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Klarte ikkje l�sa %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1938,76 +1939,76 @@ msgstr "Klarte ikkje opna r�yr for %s"
 msgid "Read error from %s process"
 msgstr "Lesefeil fr� %s-prosessen"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Ventar p� hovud"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fekk ei enkel hovudlinje over %u teikn"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "�ydelagd hovudlinje"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Length�-hovud"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig �Content-Range�-hovud"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har �ydelagd st�tte for omr�de"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Tidsavbrot p� sambandet"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fr� tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr� tenaren"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "�ydelagde hovuddata"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2298,12 +2299,12 @@ msgstr "Kandidatversjonar"
 msgid "Dependency generation"
 msgstr "Genererer kravforhold"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
@@ -2404,11 +2405,18 @@ msgstr "Listekatalogen %spartial manglar."
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial manglar."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2551,11 +2559,15 @@ msgstr "IU-feil ved lagring av kjeldelager"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "endring av namn mislukkast, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2564,7 +2576,7 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du m� fiksa denne pakken sj�lv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2572,14 +2584,14 @@ msgid ""
 msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du m� fiksa denne pakken sj�lv."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
@@ -2723,18 +2735,25 @@ msgid "Removed %s"
 msgstr "Tilr�dingar"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Opnar oppsettsfila %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Klarte ikkje fjerna %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
+#~ msgid "Reading file list"
+#~ msgstr "Les filliste"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Klarte ikkje l�sa %s"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Ukjend utgjevar-ID �%s� i linja %u i kjeldelista %s"
diff --git a/po/pl.po b/po/pl.po
index 230a50e73..5fa6838f5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,13 +1,13 @@
 # Advanced Package Transfer - APT message translation catalog
 # Polish translation by:
 # Marcin Owsiany <porridge@debian.org>, 2002, 2003, 2004.
-# Bartosz Fenski <fenio@debian.org>, 2005
+# Bartosz Fenski <fenio@debian.org>, 2005, 2006
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-02-11 11:47+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-01-23 15:32+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
 "MIME-Version: 1.0\n"
@@ -147,14 +147,14 @@ msgstr "  Tabela wersji:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s dla %s %s skompilowany %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -232,19 +232,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Prosz� wprowadzi� nazw� dla tej p�yty, np 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Zmiana no�nika: Prosz� w�o�y� dysk oznaczony\n"
-" '%s'\n"
-"do nap�du '%s' i nacisn�� enter\n"
+msgstr "Prosz� w�o�y� dysk do nap�du i nacisn�� enter"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Powt�rz ten proces dla reszty p�yt."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -338,10 +334,9 @@ msgstr "B��d przy zapisywaniu nag��wka do pliku zawarto�ci"
 #: ftparchive/apt-ftparchive.cc:401
 #, c-format
 msgid "Error processing contents %s"
-msgstr "B��d przy przetwarzaniu zawarto�ci %s"
+msgstr "B��d podczas przetwarzania zawarto�ci %s"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -522,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Osi�gni�to ograniczenie od��czania %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Nie uda�o si� wykona� operacji stat na %s"
@@ -636,257 +631,255 @@ msgstr "Problem przy usuwaniu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Nie uda�o si� zmieni� nazwy %s na %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "T"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "B��d kompilacji wyra�enia regularnego - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
 msgid "The following packages have unmet dependencies:"
 msgstr "Nast�puj�ce pakiety maj� niespe�nione zale�no�ci:"
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc: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 nast�puj�ce NOWE pakiety:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "Nast�puj�ce pakiety zostan� USUNI�TE:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "Nast�puj�ce pakiety zosta�y zatrzymane:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "Nast�puj�ce 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 nast�puj�cych pakiet�w:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "Zostan� zmienione nast�puj�ce zatrzymane pakiety:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (z powodu %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 ""
-"UWAGA: Zostan� usuni�te nast�puj�ce istotne pakiety\n"
+"UWAGA: Zostan� usuni�te nast�puj�ce istotne pakiety.\n"
 "Nie powinno si� tego robi�, chyba �e dok�adnie wiesz, co robisz!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 cofni�tych 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 pe�ni zainstalowanych lub usuni�tych.\n"
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:649
 msgid "Correcting dependencies..."
 msgstr "Naprawianie zale�no�ci..."
 
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
 msgid " failed."
 msgstr " nie uda�o si�."
 
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
 msgid "Unable to correct dependencies"
 msgstr "Nie uda�o si� naprawi� zale�no�ci"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
 msgid "Unable to minimize the upgrade set"
 msgstr "Nie uda�o 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 "Nale�y 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 "Niespe�nione zale�no�ci. Spr�buj u�y� -f."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "UWAGA: Nast�puj�ce pakiety nie mog� zosta� zweryfikowane!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Ostrze�enie uwierzytelniania zignorowano.\n"
 
-#: 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 "Niekt�re pakiety nie mog�y 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 "By�y problemy, a u�yto -y bez --force-yes"
 
-#: cmdline/apt-get.cc:753
+#: cmdline/apt-get.cc:755
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "B��d wewn�trzny, InstallPackages u�yto z zepsutymi pakietami!"
 
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Pakiety powinny zosta� usuni�te, ale Remove jest wy��czone."
 
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
-msgstr "B��d wewn�trzny przy dodawaniu objazdu"
+msgstr "B��d wewn�trzny, sortowanie niezako�czone"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Nie uda�o si� zablokowa� katalogu pobierania"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Nie uda�o si� odczyta� list �r�de�."
 
-#: 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 "Dziwne.. rozmiary si� nie zgadzaj�, zg�o� pod 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 "Konieczne pobranie %sB/%sB archiw�w.\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 archiw�w.\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 u�yte %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:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "W %s nie ma wystarczaj�cej ilo�ci wolnego miejsca"
+msgstr "Nie uda�o si� ustali� ilo�ci wolnego miejsca w %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Niestety w %s nie ma wystarczaj�cej ilo�ci wolnego miejsca."
 
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc: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, r�b jak m�wi�!"
 
-#: 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 ""
-"Zaraz zrobisz co� potencjalnie szkodliwego\n"
+"Zaraz zrobisz co� potencjalnie szkodliwego.\n"
 "Aby kontynuowa� wpisz zdanie '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Nie uda�o si� pobra� %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "Nie uda�o si� pobra� niekt�rych plik�w"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "Uko�czono pobieranie w trybie samego pobierania"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -894,48 +887,48 @@ msgstr ""
 "Nie uda�o si� pobra� niekt�rych archiw�w, spr�buj uruchomi� apt-get update "
 "lub u�y� opcji --fix-missing"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i zamienianie no�nik�w nie jest obecnie obs�ugiwane"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
 msgid "Unable to correct missing packages."
 msgstr "Nie uda�o si� poprawi� brakuj�cych pakiet�w."
 
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc: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 zosta�o 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, wi�c nie zostanie usuni�ty.\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 "Nale�y 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"
@@ -946,50 +939,50 @@ msgstr ""
 "Zazwyczaj oznacza to, �e pakietu brakuje, zosta� zast�piony przez inny\n"
 "pakiet lub nie jest dost�pny przy pomocy obecnie ustawionych �r�de�.\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr "Jednak nast�puj�ce pakiety go zast�puj�:"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc: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 mo�liwe, nie mo�e 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 zosta�o 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 zosta�a 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Polecenie update nie wymaga �adnych argument�w"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Nie uda�o si� zablokowa� katalogu list"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -997,25 +990,25 @@ msgstr ""
 "Nie uda�o si� pobra� niekt�rych plik�w indeksu, zosta�y one zignorowane lub "
 "zosta�a u�yta ich starsza wersja."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "B��d wewn�trzny, AllUpgrade wszystko popsu�o"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nie uda�o si� odnale�� pakietu %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Uwaga, wybieranie %s za wyra�enie '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Nale�y uruchomi� `apt-get -f install', aby je naprawi�:"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1023,7 +1016,7 @@ msgstr ""
 "Niespe�nione zale�no�ci. Spr�buj 'apt-get -f install' bez pakiet�w (lub "
 "podaj rozwi�zanie)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1031,134 +1024,138 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 "Nie uda�o si� zainstalowa� niekt�rych pakiet�w. Mo�e to oznacza�,\n"
-"�e za��da�e�/�a� niemo�liwej sytuacji lub u�ywasz dystrybucji\n"
-"niestabilnej, w kt�rej niekt�re pakiety nie zosta�y jeszcze utworzone\n"
-"lub przeniesione z katalogu Incoming (\"Przychodz�ce\")."
+"�e za��dano niemo�liwej sytuacji lub u�ywasz dystrybucji niestabilnej,\n"
+"w kt�rej niekt�re pakiety nie zosta�y jeszcze utworzone lub przeniesione\n"
+"z katalogu Incoming (\"Przychodz�ce\")."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
-"Poniewa� za��da�e�/�a� tylko jednej operacji, jest bardzo prawdopodobne, �e\n"
+"Poniewa� za��dno tylko jednej operacji, jest bardzo prawdopodobne, �e\n"
 "danego pakietu po prostu nie da si� zainstalowa� i nale�y zg�osi� w nim\n"
 "b��d."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Nast�puj�ce informacje mog� pom�c rozpozna� sytuacj�:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pakiety s� b��dne"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Zostan� zainstalowane nast�puj�ce dodatkowe pakiety:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Sugerowane pakiety:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Polecane pakiety:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Obliczanie aktualizacji..."
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Nie uda�o si�"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Gotowe"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "B��d wewn�trzny, AllUpgrade wszystko popsu�o"
+msgstr "B��d wewn�trzny, rozwi�zywanie problem�w wszystko popsu�o"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Nale�y poda� przynajmniej jeden pakiet, dla kt�rego maj� zosta� pobrane "
 "�r�d�a"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nie uda�o si� odnale�� �r�d�a dla pakietu %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Pomijanie ju� pobranego pliku '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "W %s nie ma wystarczaj�cej ilo�ci wolnego miejsca"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Konieczne pobranie %sB/%sB archiw�w �r�de�.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Konieczne pobranie %sB archiw�w �r�de�.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Pobierz �r�d�o %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Nie uda�o si� pobra� niekt�rych archiw�w."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Pomijanie rozpakowania ju� rozpakowanego �r�d�a w %s\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Polecenie rozpakowania '%s' zawiod�o.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Sprawd� czy pakiet 'dpkg-dev' jest zainstalowany.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Polecenie budowania '%s' zawiod�o.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Proces potomny zawi�d�"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Nale�y poda� przynajmniej jeden pakiet, dla kt�rego maj� zosta� pakiety "
 "wymagane do budowania"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Nie uda�o si� pobra� informacji o zale�no�ciach na czas budowania dla %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nie ma zale�no�ci czasu budowania.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1167,7 +1164,7 @@ msgstr ""
 "Zale�no�� %s od %s nie mo�e zosta� spe�niona, poniewa� nie znaleziono "
 "pakietu %s"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,32 +1173,32 @@ msgstr ""
 "Zale�no�� %s od %s nie mo�e zosta� spe�niona, poniewa� �adna z dost�pnych "
 "wersji pakietu %s nie ma odpowiedniej wersji"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nie uda�o si� spe�ni� zale�no�ci %s od %s: Zainstalowany pakiet %s jest zbyt "
 "nowy"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Nie uda�o si� spe�ni� zale�no�ci %s od %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Nie uda�o si� spe�ni� zale�no�ci na czas budowania od %s."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Nie uda�o si� przetworzy� zale�no�ci na czas budowania"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Obs�ugiwane modu�y:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1454,7 +1451,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Zduplikowany plik konfiguracyjny %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "Nie uda�o si� zapisa� pliku %s"
 
@@ -1558,7 +1555,7 @@ msgstr "Nie uda�o si� przej�� do katalogu administracyjnego %sinfo"
 msgid "Internal error getting a package name"
 msgstr "B��d wewn�trzny podczas pobierania nazwy pakietu"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Czytanie listy plik�w"
 
@@ -1605,10 +1602,6 @@ msgstr "B��d wewn�trzny przy dodawaniu objazdu"
 msgid "The pkg cache must be initialized first"
 msgstr "Magazyn podr�czny pakiet�w musi wcze�niej zosta� zainicjalizowany"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Czytanie listy plik�w"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1674,20 +1667,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nie uda�o si� odmontowa� CD-ROM-u w %s, by� mo�e wci�� jest u�ywany."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Nie odnaleziono pliku"
+msgstr "Nie odnaleziono dysku."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Nie uda�o si� wykona� operacji stat"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Nie uda�o si� ustawi� czasu modyfikacji"
 
@@ -1816,7 +1808,7 @@ msgstr "Przekroczony czas po��czenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie uda�o si� przyj�� po��czenia"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Nie uda�o si� obliczy� skr�tu pliku"
 
@@ -1839,7 +1831,7 @@ msgstr "Nie uda�o si� przes�a� danych, serwer powiedzia� '%s'"
 msgid "Query"
 msgstr "Info"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Nie mo�na wywo�a� "
 
@@ -1868,75 +1860,78 @@ msgstr "Nie uda�o si� zainicjalizowa� po��czenia z %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nie uda�o si� po��czy� z %s:%s (%s), przekroczenie czasu po��czenia"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nie uda�o si� po��czy� z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "��czenie z %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nie uda�o si� przet�umaczy� nazwy '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tymczasowy b��d przy t�umaczeniu '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Co� niegodziwego sta�o si� przy t�umaczeniu '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Nie uda�o si� po��czy� z %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nie uda�o si� przet�umaczy� nazwy '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Lista argument�w Acquire::gpgv::Options zbyt d�uga. Wychodzimy."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"B��d wewn�trzny: Prawid�owa sygnatura, ale nie nie uda�o si� ustali� "
+"jejodcisku?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nie uda�o si� uzyska� blokady %s"
+msgstr "Napotkano przynajmniej jedn� nieprawid�ow� sygnatur�."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " by zweryfikowa� sygnatur� (czy gnupg jest zainstalowane?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Nieznany b��d podczas uruchamiania gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Zostan� zainstalowane nast�puj�ce dodatkowe pakiety:"
+msgstr "Nast�puj�ce sygnatury by�y b��dne:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Nast�puj�ce sygnatury nie mog�y zosta� zweryfikowane z powodu braku klucza "
+"publicznego:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1948,76 +1943,76 @@ msgstr "Nie uda�o si� otworzy� potoku dla %s"
 msgid "Read error from %s process"
 msgstr "B��d odczytu z procesu %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nag��wki"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Otrzymano pojedyncz� lini� nag��wka o d�ugo�ci ponad %u znak�w"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Nieprawid�owa linia nag��wka"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przys�a� nieprawid�owy nag��wek odpowiedzi"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przys�a� nieprawid�owy nag��wek Content-Length"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przys�a� nieprawid�owy nag��wek Content-Range"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawid�owo obs�uguje zakresy (ranges)"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Operacja select nie powiod�a si�"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu po��czenia"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "B��d przy pisaniu do pliku wyj�ciowego"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "B��d przy pisaniu do pliku"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "B��d przy pisaniu do pliku"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "B��d czytania z serwera: Zdalna strona zamkn�a po��czenie"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "B��d czytania z serwera"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "B��dne dane nag��wka"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Po��czenie nie uda�o si�"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
@@ -2309,12 +2304,12 @@ msgstr "Kandyduj�ce wersje"
 msgid "Dependency generation"
 msgstr "Generowanie zale�no�ci"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nie uda�o si� zanalizowa� pliku pakietu %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nie uda�o si� zanalizowa� pliku pakietu %s (2)"
@@ -2360,9 +2355,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Nieprawid�owa linia %u w li�cie �r�de� %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ '%s' jest nieznany - linia %u listy �r�de� %s"
+msgstr "Typ '%s' jest nieznany w linii %u listy �r�de� %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2403,7 +2398,7 @@ msgstr ""
 
 #: apt-pkg/algorithms.cc:1061
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "Nie uda�o si� naprawi� problem�w, zatrzyma�e�/�a� uszkodzone pakiety."
+msgstr "Nie uda�o si� naprawi� problem�w, zatrzymano uszkodzone pakiety."
 
 #: apt-pkg/acquire.cc:62
 #, c-format
@@ -2415,10 +2410,17 @@ msgstr "Brakuje katalogu list %spartial."
 msgid "Archive directory %spartial is missing."
 msgstr "Brakuje katalogu archiw�w %spartial."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Pobieranie pliku %li z %li (%s pozosta�o)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Czytanie listy plik�w"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2431,12 +2433,9 @@ msgid "Method %s did not start correctly"
 msgstr "Metoda %s nie uruchomi�a si� poprawnie."
 
 #: 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 ""
-"Zmiana no�nika: Prosz� w�o�y� dysk oznaczony\n"
-" '%s'\n"
-"do nap�du '%s' i nacisn�� enter\n"
+msgstr "W�� do nap�du '%s' dysk o nazwie: '%s' i naci�nij enter."
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2484,69 +2483,67 @@ msgstr "Magazyn podr�czny ma niezgodny system wersji"
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (NewPackage)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (UsePackage1)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (UsePackage2)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (NewFileVer1)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (NewVersion1)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (UsePackage3)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (NewVersion2)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
-"Och, przekroczy�e�/�a� liczb� pakiet�w, kt�r� ten APT jest w stanie obs�u�y�."
+"Och, przekroczono liczb� pakiet�w, kt�r� ten APT jest w stanie obs�u�y�."
 
 #: apt-pkg/pkgcachegen.cc:210
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Och, przekroczy�e�/�a� liczb� wersji, kt�r� ten APT jest w stanie obs�u�y�."
+msgstr "Och, przekroczono liczb� wersji, kt�r� ten APT jest w stanie obs�u�y�."
 
 #: apt-pkg/pkgcachegen.cc:213
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
-"Och, przekroczy�e�/�a� liczb� zale�no�ci, kt�r� ten APT jest w stanie "
-"obs�u�y�."
+"Och, przekroczono liczb� zale�no�ci, kt�r� ten APT jest w stanie obs�u�y�."
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (FindPkg)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Wyst�pi� b��d przy przetwarzaniu %s (CollectFileProvides)"
+msgstr "Wyst�pi� b��d podczas przetwarzania %s (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
-"Pakiet %s %s nie zosta� odnaleziony przy przetwarzaniu zale�no�ci plik�w"
+"Pakiet %s %s nie zosta� odnaleziony podczas przetwarzania zale�no�ci plik�w"
 
 #: apt-pkg/pkgcachegen.cc:574
 #, c-format
@@ -2566,11 +2563,15 @@ msgstr "B��d wej�cia/wyj�cia przy zapisywaniu podr�cznego magazynu �r�de�"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nie uda�o si� zmieni� nazwy, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "B��dna suma MD5"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Dla nast�puj�cego identyfikatora klucza brakuje klucza publicznego:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2579,7 +2580,7 @@ msgstr ""
 "Nie uda�o si� odnale�� pliku dla pakietu %s. Mo�e to oznacza�, �e trzeba "
 "b�dzie r�cznie naprawi� ten pakiet (z powodu brakuj�cej architektury)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2588,14 +2589,14 @@ msgstr ""
 "Nie uda�o si� odnale�� pliku dla pakietu %s. Mo�e to oznacza�, �e trzeba "
 "b�dzie r�cznie naprawi� ten pakiet."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pliki indeksu pakiet�w s� uszkodzone. Brak pola Filename: dla pakietu %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "B��dny rozmiar"
 
@@ -2648,7 +2649,8 @@ msgstr "Skawnowanie p�yty w poszukiwaniu plik�w indeksu..\n"
 #, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr ""
-"Znaleziono %i indeks�w pakiet�w, %i indeks�w �r�d�owych i %i sygnatur\n"
+"Znaleziono %i indeks�w pakiet�w, %i indeks�w �r�d�owych, %i indeks�w "
+"t�umacze� i %i sygnatur\n"
 
 #: apt-pkg/cdrom.cc:710
 msgid "That is not a valid name, try again.\n"
@@ -2700,55 +2702,86 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapisano %i rekord�w z %i brakuj�cymi plikami i %i niepasuj�cymi\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Otwieranie %s"
+msgstr "Przygotowanie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Otwieranie %s"
+msgstr "Rozpakowywanie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Otwieranie pliku konfiguracyjnego %s"
+msgstr "Przygotowanie do konfiguracji %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "��czenie z %s"
+msgstr "Konfigurowanie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Zainstalowana: "
+msgstr "  Zainstalowany %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Przygotowanie do usuni�cia %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Otwieranie %s"
+msgstr "Usuwanie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Poleca"
+msgstr "Usuni�to %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Przygotowanie do konfiguracji %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Nie uda�o si� usun�� %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Po��czenie zosta�o zamkni�te przedwcze�nie"
+
+#~ msgid "Reading file list"
+#~ msgstr "Czytanie listy plik�w"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nie uda�o si� uruchomi� "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Przygotowanie do usuni�cia %s wraz z konfiguracj�"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Usuni�to %s wraz z konfiguracj�"
+
+#~ msgid "Total Distinct Descriptions: "
+#~ msgstr "W sumie r�nych opis�w: "
+
+#~ msgid "Total Desc/File relations: "
+#~ msgstr "W sumie zale�no�ci opis/plik: "
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Wyst�pi� b��d podczas przetwarzania %s (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Wyst�pi� b��d podczas przetwarzania %s (NewFileDesc2)"
+
+#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#~ msgstr ""
+#~ "Och, przekroczono liczb� opis�w, kt�r� ten APT jest w stanie obs�u�y�."
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nie uda�o si� na�o�y� �atki na plik"
diff --git a/po/pt.po b/po/pt.po
index 7ece08e33..d638e9b01 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,14 +1,13 @@
 # Debian-PT translation for apt.
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo <elmig@debianpt.org>, 2003.
-# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy.
+# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-03-07 22:20+0000\n"
-"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
+"Last-Translator: Rui Az. <astronomy@mail.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +101,7 @@ msgstr "Ficheiros de Pacotes :"
 #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
-"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote"
+"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
 
 #: cmdline/apt-cache.cc:1470
 #, c-format
@@ -146,14 +145,14 @@ msgstr "  Tabela de Versão:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s para %s %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -230,17 +229,15 @@ msgstr ""
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
+"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, 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"
+msgstr "Por favor insira um Disco no leitor e pressione enter"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Repita este processo para o resto dos CDs no seu conjunto."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -399,7 +396,7 @@ msgstr ""
 "árvore de .dscs. A opção --source-override pode ser utilizada para \n"
 "especificar um ficheiro override de fontes\n"
 "\n"
-"Os comandos 'packages' e 'sources' devem ser executados na raíz da \n"
+"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n"
 "árvore. CaminhoBinário deve apontar para a base de procura recursiva \n"
 "e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n"
 "incluído aos campos filename caso esteja presente. Exemplo de uso do \n"
@@ -517,7 +514,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falha ao executar stat %s"
@@ -631,259 +628,257 @@ msgstr "Problema ao executar unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falha ao renomear %s para %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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
-#, 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 ""
-"AVISO: Os seguintes pacotes essenciais serão removidos\n"
-"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a "
-"fazer!"
+"AVISO: Os seguintes pacotes essenciais serão removidos.\n"
+"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 ""
+msgstr "Aviso de autenticação ultrapassado.\n"
 
-#: 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"
+msgstr "Alguns pacotes não 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 ""
+msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!"
 
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno ao adicionar um desvio"
+msgstr "Erro Interno, Ordering não terminou"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 ""
+"Estranho.. Os tamanhos não coincidiram, escreva para 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 "É 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"
+"Depois de 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:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Desculpe, você não tem espaço suficiente em %s"
+msgstr "Impossível de determinar espaço livre em %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc: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
-#, 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 ""
-"Você está prestes a fazer algo potencialmente prejudicial\n"
+"Você está prestes a fazer algo potencialmente nocivo.\n"
 "Para continuar escreva a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -891,47 +886,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."
+msgstr "Você deve seleccionar 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"
@@ -942,51 +937,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:"
+msgstr "No entanto, os seguintes pacotes substituem-no:"
 
-#: 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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "O comando update não leva argumentos"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Impossível criar lock no directório de listas"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -994,25 +989,25 @@ msgstr ""
 "Falhou o download de alguns ficheiros de índice, foram ignorados ou os "
 "antigos foram usados em seu lugar."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade estragou algo"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1020,7 +1015,7 @@ msgstr ""
 "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solução)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1029,176 +1024,180 @@ msgid ""
 msgstr ""
 "Alguns pacotes não puderam ser instalados. Isso pode significar que\n"
 "você solicitou uma situação impossível ou se você está a usar a\n"
-"distribuição instável, que alguns pacotes requesitados ainda não foram \n"
+"distribuição instável, que alguns pacotes requisitados ainda não foram \n"
 "criados ou foram tirados do Incoming."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
-"Já que você requisitou uma única operação é extremamanete provável que o \n"
+"Já que você requisitou uma única operação é extremamente provável que o \n"
 "pacote esteja simplesmente não instalável e deve ser enviado um relatório "
 "de\n"
 "bug sobre esse pacote."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pacotes estragados"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Os seguintes pacotes extra serão instalados:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos :"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados :"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Calculando Actualização... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Erro Interno, AllUpgrade quebrou as coisas"
+msgstr "Erro Interno, o solucionador de problemas estragou coisas"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, 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:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, 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:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter Código Fonte %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Falha ao obter alguns arquivos."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "O comando de descompactação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "O comando de compilação '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "O processo filho falhou"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de compilação.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"a dependência de %s  por %s não pôde ser satisfeita porque o pacote %s não "
+"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não "
 "pôde ser encontrado"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão "
-"disponível do pacote %s pode satisfazer os requesitos de versão"
+"disponível do pacote %s pode satisfazer os requisitos de versão"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Falha ao processar as dependências de compilação"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1418,7 +1417,7 @@ msgstr "Arquivo é demasiado pequeno"
 
 #: apt-inst/contrib/arfile.cc:135
 msgid "Failed to read the archive headers"
-msgstr "Falha ao ler os cabeçahos do arquivo"
+msgstr "Falha ao ler os cabeçalhos do arquivo"
 
 #: apt-inst/filelist.cc:384
 msgid "DropNode called on still linked node"
@@ -1439,7 +1438,7 @@ msgstr "Erro Interno em AddDiversion"
 #: apt-inst/filelist.cc:481
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s"
+msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s"
 
 #: apt-inst/filelist.cc:510
 #, c-format
@@ -1452,7 +1451,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Arquivo de configuração duplicado %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "Falha ao escrever ficheiro %s"
 
@@ -1488,7 +1487,7 @@ msgstr "O caminho de desvio é muito longo"
 #: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
-msgstr "O directório %s está sendo substituído por um não-diretório"
+msgstr "O directório %s está sendo substituído por um não-directório"
 
 #: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
@@ -1506,7 +1505,7 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s"
 #: apt-inst/extract.cc:434
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s"
+msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s"
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
@@ -1556,7 +1555,7 @@ msgstr "Falha ao mudar para o directório administrativo %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Erro Interno obtendo um Nome de Pacote"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lendo Listagem de Ficheiros"
 
@@ -1603,10 +1602,6 @@ msgstr "Erro Interno ao adicionar um desvio"
 msgid "The pkg cache must be initialized first"
 msgstr "A cache de pacotes tem de ser inicializada primeiro"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lendo Lista de Ficheiros"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1672,20 +1667,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Arquivo não encontrado"
+msgstr "Disco não encontrado"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Falha ao executar stat"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Falha ao definir hora de modificação"
 
@@ -1813,7 +1807,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema fazendo o hash do ficheiro"
 
@@ -1836,7 +1830,7 @@ msgstr "Transferência de dados falhou, o servidor respondeu '%s'"
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Impossível invocar "
 
@@ -1863,77 +1857,81 @@ msgstr "Não posso iniciar a ligação para %s:%s (%s)."
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou"
+msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Não foi possível ligar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ligando a %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Não foi possível resolver '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária resolvendo '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Impossível ligar a %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Não foi possível resolver '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
+"E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Erro interno: Assinatura válida, mas não foi possível determinar a impressão "
+"digital da chave?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Não foi possível obter lock %s"
+msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " para verificar assinatura (gnupg instalado?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro desconhecido ao executar gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Os seguintes pacotes extra serão instalados:"
+msgstr "As seguintes assinaturas estavam inválidas:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"As seguintes assinaturas não puderam ser verificadas porque a chave pública "
+"não está disponível:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1945,76 +1943,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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor http enviou um cabeçalho de resposta inválido"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor http possui suporte a range errado"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Select falhou."
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "A ligação expirou"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Erro gravando para ficheiro de saída"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Erro gravando para ficheiro"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Erro gravando para o ficheiro"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Falhou a ligação"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2307,12 +2305,12 @@ msgstr "Versões Candidatas"
 msgid "Dependency generation"
 msgstr "Geração de Dependência"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Impossível o parse ao ficheiro de pacote %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Impossível o parse ao ficheiro de pacote %s (2)"
@@ -2358,7 +2356,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Linha malformada %u na lista de fontes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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"
 
@@ -2412,12 +2410,19 @@ msgstr "Falta directório de listas %spartial."
 #: apt-pkg/acquire.cc:66
 #, c-format
 msgid "Archive directory %spartial is missing."
-msgstr "Falta o diretório de repositório %spartial."
+msgstr "Falta o directório de repositório %spartial."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "A efectuar download de ficheiro %li de %li (%s restantes)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Lendo Listagem de Ficheiros"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2430,12 +2435,10 @@ msgid "Method %s did not start correctly"
 msgstr "Método %s não iniciou corretamente"
 
 #: 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 ""
-"Troca de mídia: Por favor insira o disco chamado\n"
-" '%s'\n"
-"na drive '%s' e pressione enter\n"
+"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2459,7 +2462,7 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list"
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
-"As listas de pacotes ou o ficheiro de status não pôde ser analizado ou "
+"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou "
 "aberto."
 
 #: apt-pkg/cachefile.cc:77
@@ -2568,21 +2571,27 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falhou renomear, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Não existe qualquer chave pública disponível para as seguintes IDs de "
+"chave:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 "Não foi possível localizar um arquivo para o pacote %s. Isto pode significar "
-"que você precisa consertar manualmente este pacote. (devido a arquitetura "
+"que você precisa consertar manualmente este pacote. (devido a arquitectura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2591,7 +2600,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:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2599,9 +2608,9 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
-msgstr "Tamanho incorreto"
+msgstr "Tamanho incorrecto"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
@@ -2705,59 +2714,71 @@ msgstr ""
 "coincidentes\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Abrindo %s"
+msgstr "A preparar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Abrindo %s"
+msgstr "A desempacotar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Abrindo ficheiro de configuração %s"
+msgstr "A preparar para configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Ligando a %s"
+msgstr "A configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instalado: "
+msgstr "%s instalado"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "A preparar para remoção de %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Abrindo %s"
+msgstr "A remover %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Recomenda"
+msgstr "%s removido"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "A preparar para configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Falha ao remover %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Conexão encerrada prematuramente"
 
+#~ msgid "Reading file list"
+#~ msgstr "Lendo Lista de Ficheiros"
+
+#~ msgid "Could not execute "
+#~ msgstr "Impossível de executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "A preparar para remover com a configuração %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Removido com a configuração %s"
+
 #~ msgid "The pkg cache must be initialize first"
 #~ msgstr "A cache de pacotes deve ser inicializada primeiro"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 91113c684..3a51c828b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-06-16 10:24-0300\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-02-11 17:57-0200\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -147,14 +147,14 @@ msgstr "  Tabela de Vers�o:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s para %s %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -232,17 +232,15 @@ msgstr ""
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
+"Por favor, forne�a um nome para este Disco, como 'Debian 2.1r1 Disco 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, 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"
+msgstr "Por favor, insira um Disco no leitor e pressione enter"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Pepita este processo para o restante dos CDs em seu conjunto."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -519,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falha ao checar %s"
@@ -633,258 +631,257 @@ msgstr "Problema executando unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Falha ao renomear %s para %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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 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 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 NOVOS pacotes a seguir ser�o instalados:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "Os pacotes a seguir ser�o REMOVIDOS:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "Os pacotes a seguir ser�o mantidos em suas vers�es atuais :"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "Os pacotes a seguir ser�o atualizados :"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Os pacotes a seguir ser�o REBAIXADOS de vers�o :"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "Os pacotes segurados a seguir ser�o mudados :"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por causa de %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 ""
-"AVISO: Os pacotes essenciais a seguir ser�o removidos\n"
-"Isso N�O deve ser feito a menos que voc� saiba exatamente o que est� fazendo!"
+"AVISO: Os pacotes essenciais a seguir ser�o removidos.\n"
+"Isso N�O deveria ser feito a menos que voc� saiba exatamente o que voc� est� "
+"fazendo !"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 n�o 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 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 atualiza��es"
 
-#: 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 "Depend�ncias 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 n�o podem ser autenticados !"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Aviso de autentica��o sobrescrito.\n"
 
-#: 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 [s/N] ? "
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:702
 msgid "Some packages could not be authenticated"
 msgstr "Alguns pacotes n�o puderam ser autenticados"
 
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
+#: cmdline/apt-get.cc: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 ""
+msgstr "Erro Interno, Install Packages foi chamado com pacotes quebrados !"
 
-#: 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 remo��o est� desabilitada."
 
-#: cmdline/apt-get.cc:773
-#, fuzzy
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
-msgstr "Erro Interno ao adicionar um desvio"
+msgstr "Erro Interno, Ordena��o n�o finalizou"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Imposs�vel criar lock no diret�rio de download"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 ""
+msgstr "Que estranho .. Os tamanhos n�o batem, informe 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 "� 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 espa�o em disco ser�o 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 espa�o em disco ser�o liberados.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Desculpe, voc� n�o tem espa�o suficiente em %s"
+msgstr "N�o foi poss�vel determinar o espa�o livre em %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Voc� n�o possui espa�o suficiente em %s."
 
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Triviais Apenas especificado mas essa n�o � uma opera��o trivial."
 
-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:866
 msgid "Yes, do as I say!"
 msgstr "Sim, fa�a o que eu digo!"
 
-#: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:868
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"Voc� est� prestes a fazer algo potencialmente destruidor\n"
+"Voc� est� prestes a fazer algo potencialmente destruidor.\n"
 "Para continuar digite a frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -892,47 +889,47 @@ msgstr ""
 "Imposs�vel pegar alguns arquivos, talvez rodar apt-get update ou tentar com "
 "--fix-missing?"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing e troca de m�dia n�o s�o suportados atualmente"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
 msgid "Unable to correct missing packages."
 msgstr "Imposs�vel corrigir pacotes faltosos."
 
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:996
 msgid "Aborting install."
 msgstr "Abortando Instala��o."
 
-#: 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 inv�s 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 atualiza��o n�o 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 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 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"
@@ -943,51 +940,51 @@ msgstr ""
 "Isso pode significar que o pacote est� faltando, ficou obsoleto ou\n"
 "est� dispon�vel somente a partir de outra fonte\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc: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 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 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' n�o foi encontrada"
 
-#: 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 selecionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "O comando update n�o leva argumentos"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Imposs�vel criar lock no diret�rio de listas"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -995,25 +992,25 @@ msgstr ""
 "Alguns arquivos de �ndice falharam no download, eles foram ignorados ou os "
 "antigos foram usados em seu lugar."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro Interno, AllUpgrade quebrou as coisas"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Imposs�vel achar pacote %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, selecionando %s para express�o regular '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1021,7 +1018,7 @@ msgstr ""
 "Depend�ncias desencontradas. Tente `apt-get -f install' sem nenhum pacote "
 "(ou especifique uma solu��o)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1033,7 +1030,7 @@ msgstr ""
 "distribui��o inst�vel, que alguns pacotes requeridos n�o foram \n"
 "criados ainda ou foram tirados do Incoming."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1043,117 +1040,121 @@ msgstr ""
 "esteja simplesmente n�o instal�vel e um relato de erro sobre esse\n"
 "pacotes deve ser enviado."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "A informa��o a seguir pode ajudar a resolver a situa��o:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pacotes quebrados"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Os pacotes extra a seguir ser�o instalados:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Pacotes sugeridos :"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Pacotes recomendados :"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Calculando Atualiza��o... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Falhou"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Pronto"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Erro Interno, AllUpgrade quebrou as coisas"
+msgstr "Erro Interno, o solucionador de problemas quebrou coisas"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Imposs�vel encontrar um pacote fonte para %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Omitindo arquivo j� obtido '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Precisa obter %sB de arquivos fonte.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter Fonte %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Falha ao fazer o download de alguns arquivos."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comando de desempacotamento '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Confira se o pacote dpkg-dev est� instalado.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comando de constru��o '%s' falhou.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Processo filho falhou"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Deve-se especificar pelo menos um pacote para que se cheque as depend�ncias "
 "de constru��o"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Imposs�vel conseguir informa��es de depend�ncia de constru��o para %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n�o tem depend�ncias de constru��o.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1162,7 +1163,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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1171,32 +1172,32 @@ msgstr ""
 "a depend�ncia de %s por %s n�o pode ser satisfeita porque nenhuma vers�o "
 "dispon�vel do pacote %s pode satisfazer os requerimentos de vers�o"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Falha ao satisfazer depend�ncia %s para %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Falha ao processar as depend�ncias de constru��o"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "M�dulos Suportados:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1449,7 +1450,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Arquivo de confgiura��o duplicado %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "Falha ao gravar arquivo %s"
 
@@ -1553,7 +1554,7 @@ msgstr "Falha ao mudar para o diretorio administrativo %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Erro Interno obtendo um Nome de Pacote"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Lendo Listagem de Pacotes"
 
@@ -1597,14 +1598,9 @@ msgid "Internal error adding a diversion"
 msgstr "Erro Interno ao adicionar um desvio"
 
 #: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "O cache de pacotes deve ser inicializado primeiro"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Lendo Listagem de Pacotes"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1672,20 +1668,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Imposs�vel desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Arquivo n�o encontrado"
+msgstr "Disco n�o encontrado."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Arquivo n�o encontrado"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Falha ao checar"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Falha ao definir hora de modifica��o"
 
@@ -1813,7 +1808,7 @@ msgstr "Conex�o do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Imposs�vel aceitar conex�o"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema fazendo o hash do arquivo"
 
@@ -1836,7 +1831,7 @@ msgstr "Transfer�ncia de dados falhou, servidor respondeu '%s'"
 msgid "Query"
 msgstr "Pesquisa"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Imposs�vel invocar "
 
@@ -1865,75 +1860,79 @@ msgstr "N�o posso iniciar a conex�o para %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "N�o foi poss�vel conectar em %s:%s (%s), conex�o expirou"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "N�o foi poss�vel conectar em %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "N�o foi poss�vel resolver '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Falaha tempor�ria resolvendo '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Imposs�vel conectar em %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "N�o foi poss�vel resolver '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
+"E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Sa�ndo."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Erro interno : Assintura boa, mas n�o foi poss�vel determinar a impress�o "
+"digital da chave ?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "N�o foi poss�vel obter trava %s"
+msgstr "Ao menos uma assinatura inv�lida foi encontrada."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " ao verificar assinatura (o gnupg est� instalado ?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Erro desconhecido executando gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Os pacotes extra a seguir ser�o instalados:"
+msgstr "As seguintes assinaturas foram inv�lidas :\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"As assinaturas a seguir n�o puderam ser verificadas devido a chave p�blica "
+"n�o estar dispon�vel :\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1945,76 +1944,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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Aguardando por cabe�alhos"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma �nica linha de cabe�alho acima de %u caracteres"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Linha de cabe�alho ruim"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor http enviou um cabe�alho de resposta inv�lido"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor http enviou um cabe�alho Conten-Length inv�lido"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor http enviou um cabe�alho Conten-Range inv�lido"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor http possui suporte a range quebrado"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Sele��o falhou."
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Conex�o expirou"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Erro gravando para arquivo de sa�da"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Erro gravando para arquivo"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Erro gravando para o arquivo"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor Ponto remoto fechou a conex�o"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Dados de cabe�alho ruins"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Conex�o falhou."
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2307,12 +2306,12 @@ msgstr "Vers�es Candidatas"
 msgid "Dependency generation"
 msgstr "Gera��o de Depend�ncia"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Imposs�vel analizar arquivo de pacote %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Imposs�vel analizar arquivo de pacote %s (2)"
@@ -2358,7 +2357,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Linha malformada %u no arquivo de fontes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' n�o � conhecido na linha %u na lista de fontes %s"
 
@@ -2414,10 +2413,17 @@ msgstr "Diret�rio de listas %spartial est� faltando."
 msgid "Archive directory %spartial is missing."
 msgstr "Diret�rio de reposit�rio %spartial est� faltando."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Fazendo o download do arquivo %li de %li (%s restantes)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Lendo Listagem de Pacotes"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2430,12 +2436,10 @@ msgid "Method %s did not start correctly"
 msgstr "M�todo %s n�o iniciou corretamente"
 
 #: 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 ""
-"Troca de m�dia: Por favor insira o disco nomeado\n"
-" '%s'\n"
-"no drive '%s' e pressione enter\n"
+"Por favor, insira o disco nomeado : '%s' no leitor '%s' e pressione enter."
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2485,37 +2489,37 @@ msgid "Cache has an incompatible versioning system"
 msgstr "O Cache possui um sistema de vers�es incompat�vel"
 
 #: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Um erro ocorreu processando %s (NovoPacote)"
 
 #: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Um erro ocorreu processando %s (UsePacote1)"
 
 #: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Um erro ocorreu processando %s (UsePacote2)"
 
 #: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "Um erro ocorreu processando %s (NovaVers�o1)"
 
 #: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Um erro ocorreu processando %s (UsePacote3)"
 
 #: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Um erro ocorreu processando %s (NovaVers�o2)"
 
@@ -2536,14 +2540,14 @@ msgstr ""
 "Ops, voc� excedeu o n�mero de depend�ncias que este APT � capaz de suportar."
 
 #: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Um erro ocorreu processando %s (FindPkg)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
 
 #: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Um erro ocorreu processando %s (CollectFileProvides)"
+msgstr "Um erro ocorreu processando %s (ColetarArquivoFornece)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
@@ -2568,11 +2572,15 @@ msgstr "Erro de I/O ao gravar cache fonte"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "renomea��o falhou, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "N�o existem chaves p�blicas para os seguintes IDs de chaves :\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2582,7 +2590,7 @@ msgstr ""
 "que voc� precisa consertar manualmente este pacote. (devido a arquitetura "
 "n�o especificada)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2591,7 +2599,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:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2599,7 +2607,7 @@ msgstr ""
 "Os arquivos de �ndice de pacotes est�o corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
@@ -2707,59 +2715,71 @@ msgstr ""
 "combinam\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Abrindo %s"
+msgstr "Preparando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Abrindo %s"
+msgstr "Desempacotando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Abrindo arquivo de configura��o %s"
+msgstr "Preparando para configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Conectando a %s"
+msgstr "Configurando %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instalado: "
+msgstr "%s instalado"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparando para a remo��o de %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Abrindo %s"
+msgstr "Removendo %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Recomenda"
+msgstr "%s removido"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparando para configurar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Falha ao remover %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Conex�o encerrada prematuramente"
 
+#~ msgid "Reading file list"
+#~ msgstr "Lendo Listagem de Pacotes"
+
+#~ msgid "Could not execute "
+#~ msgstr "N�o foi poss�vel executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparando para remo��o de %s e sua configura��o"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s e sua configura��o removidos"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 #~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
diff --git a/po/ro.po b/po/ro.po
index 338f65965..9210b4298 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,19 +1,19 @@
 # translation of apt_ro.po to Romanian
 # This file is put in the public domain.
-# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005.
 #
+# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt_po_ro\n"
+"Project-Id-Version: apt_nou\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-08-25 17:43+0300\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-02-27 11:59+0200\n"
 "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
 "Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:135
@@ -147,14 +147,14 @@ msgstr "  Tabela de versiuni:"
 msgid "       %4i %s\n"
 msgstr "        %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s pentru %s %s compilat pe %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -231,18 +231,15 @@ msgstr ""
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 msgstr ""
+"Vă rog furnizaţi un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, 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"
+msgstr "Vă rog introduceţi un disc în unitate şi apăsaţi Enter"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Repetaţi această procedură pentru restul CD-urilor."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -526,7 +523,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Limita de %sB a dezlegării a fost atinsă.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Eşuare în determinarea stării %s"
@@ -640,258 +637,257 @@ msgstr "Problemă la desfacerea %s"
 msgid "Failed to rename %s to %s"
 msgstr "Eşuare în a redenumi %s în %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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
-#, 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 ""
-"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n"
+"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n"
 "Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 ""
+msgstr "Avertisment de autentificare înlocuit.\n"
 
-#: 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 ""
+msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!"
 
-#: 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
-#, fuzzy
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
-msgstr "Eroare internă în timpul adăugării unei diversiuni"
+msgstr "Eroare internă, Ordering nu s-a terminat"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Nu pot încuia directorul de descărcare"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 ""
+"Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la 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 "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:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Nu aveţi suficient spaţiu în %s"
+msgstr "N-am putut determina spaţiul disponibil în %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc: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
-#, 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 ""
-"Sunteţi pe cale de a face ceva cu potenţial distructiv\n"
+"Sunteţi pe cale de a face ceva cu potenţial distructiv.\n"
 "Pentru a continua tastaţi fraza '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -899,47 +895,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"
@@ -950,49 +946,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Comanda de actualizare nu are argumente"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Nu pot încuia directorul cu lista"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1000,25 +996,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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1026,7 +1022,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:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1039,7 +1035,7 @@ msgstr ""
 "pachete\n"
 "cerute n-au fost create încă sau au fost mutate din Incoming."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1049,117 +1045,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:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pachete deteriorate"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Următoarele extra pachete vor fi instalate:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Pachete sugerate:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Pachete recomandate:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Calculez înnoirea... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Eşuare"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Terminat"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni"
+msgstr ""
+"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, 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:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Sar peste fişierul deja descărcat '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, 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:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Aducere sursa %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Eşuare în a aduce unele arhive."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Comanda de despachetare '%s' eşuată.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Comanda de construire '%s' eşuată.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Eşuare proces copil"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nu are dependenţe înglobate.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1168,7 +1169,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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1177,32 +1178,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, 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:2321
+#: cmdline/apt-get.cc:2338
 #, 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:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Eşuare în a prelucra dependenţele înglobate"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1457,9 +1458,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Fişier de configurare duplicat %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
-msgstr "Eşuare în a scrie fişierul %s"
+msgstr "Eşuare în scrierea fişierului %s"
 
 #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1563,7 +1564,7 @@ msgstr "Eşuare în a schimba către directorul %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Eroare internă la preluarea numelui de pachet"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Citire derulare fişier"
 
@@ -1607,14 +1608,9 @@ msgid "Internal error adding a diversion"
 msgstr "Eroare internă în timpul adăugării unei diversiuni"
 
 #: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "Cache-ul pachetului trebuie întâi iniţializat"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Citirea listei de fişiere"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1680,20 +1676,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Fişier negăsit"
+msgstr "Disc negăsit."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Fişier negăsit"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Eşuare de determinare a stării"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Eşuare la ajustarea timpului"
 
@@ -1821,7 +1816,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problemă la indexarea fişierului"
 
@@ -1844,7 +1839,7 @@ msgstr "Eşuare transfer de date, serverul a spus: '%s'"
 msgid "Query"
 msgstr "Interogare"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Nu pot invoca"
 
@@ -1873,75 +1868,78 @@ msgstr "Nu pot iniţia conectarea la %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "N-am putut conecta la %s:%s (%s), timp de conectare expirat"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "N-am putut conecta la %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nu pot rezolva '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Eşuare temporară în rezolvarea '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "S-a întâmplat ceva rău la rezolvarea '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Nu pot conecta la %s %s"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Nu pot rezolva '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia "
+"amprentei digitale?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Cel puţin o semnătură invalidă a fost întâlnită."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Nu pot determina blocajul %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " verificarea semnăturii (este instalat gnupg?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Eroare necunoscută în timp ce se execută gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Următoarele extra pachete vor fi instalate:"
+msgstr "Următoarele semnături au fost invalide:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Următoarele semnături n-au putut fi verificate datorită cheii publice care "
+"este indisponibilă:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1953,77 +1951,77 @@ msgstr "Nu pot deschide conexiunea pentru %s"
 msgid "Read error from %s process"
 msgstr "Eroare de citire din procesul %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "În aşteptarea antetelor"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Primit o singură linie de antet peste %u caractere"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Linie de antet necorespunzătoare"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serverul http a trimis un antet de răspuns necorespunzător"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serverul http a trimis un antet lungime-conţinut necorespunzător"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serverul http a trimis un antet zonă de conţinut necorespunzător"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Acest server http are zonă de suport necorespunzătoare"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Format de date necunoscut"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Eşuarea selecţiei"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Timp de conectare expirat"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fişierului de rezultat"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fişier"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fişierul"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Eroare la citirea de pe server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Conectare eşuată"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Eroare internă"
 
@@ -2316,12 +2314,12 @@ msgstr "Versiuni candidat"
 msgid "Dependency generation"
 msgstr "Generare dependenţe"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Nu pot analiza fişierul pachet %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Nu pot analiza fişierul pachet %s (2)"
@@ -2367,7 +2365,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Linie greşită %u în lista sursă %s (tip)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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"
 
@@ -2422,10 +2420,17 @@ msgstr "Directorul de liste %spartial lipseşte."
 msgid "Archive directory %spartial is missing."
 msgstr "Directorul de arhive %spartial lipseşte."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Se descarcă fişierul %li din %li (%s rămas)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Citire derulare fişier"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2438,12 +2443,10 @@ msgid "Method %s did not start correctly"
 msgstr "Metoda %s nu s-a lansat corect"
 
 #: 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 ""
-"Schimbare de mediu: Vă rog introduceţi discul numit\n"
-" '%s'\n"
-"în unitatea '%s' şi apăsaţi Enter\n"
+"Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter."
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2492,39 +2495,39 @@ msgid "Cache has an incompatible versioning system"
 msgstr "Cache are un versioning system incompatibil"
 
 #: apt-pkg/pkgcachegen.cc:117
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Eroare în timpul procesării %s (Pachet Nou)"
+msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Eroare în timpul procesării %s (UsePackage1)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Eroare în timpul procesării %s (UsePackage2)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Eroare în timpul procesării %s (NewFileVer1)"
+msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Eroare în timpul procesării %s (NewVersion1)"
+msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Eroare în timpul procesării %s (UsePackage3)"
+msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Eroare în timpul procesării %s (NewVersion2)"
+msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2543,14 +2546,14 @@ msgstr ""
 "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT."
 
 #: apt-pkg/pkgcachegen.cc:241
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Eroare în timpul procesării %s (FindPkg)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Eroare în timpul procesării %s (CollectFileProvides)"
+msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260
 #, c-format
@@ -2576,11 +2579,17 @@ msgstr "Eroare IO în timpul salvării sursei cache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "redenumire eşuată, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Nepotrivire MD5Sum"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+"Nu există nici o cheie publică disponibilă pentru următoarele "
+"identificatoare de chei:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2589,7 +2598,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2598,7 +2607,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:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2606,7 +2615,7 @@ msgstr ""
 "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la "
 "pachetul %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
@@ -2711,55 +2720,67 @@ msgstr ""
 "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Deschidere %s"
+msgstr "Se pregăteşte %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Deschidere %s"
+msgstr "Se despachetează %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Deschidere fişier de configurare %s"
+msgstr "Se pregăteşte configurarea %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Conectare la %s"
+msgstr "Se configurează %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instalat: "
+msgstr "Instalat %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Se pregăteşte ştergerea lui %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Deschidere %s"
+msgstr "Se şterge %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Recomandă"
+msgstr "Şters %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Se pregăteşte configurarea %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Eşuare în ştergerea %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Conexiune închisă prematur"
+
+#~ msgid "Reading file list"
+#~ msgstr "Citirea listei de fişiere"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nu s-a putut executa "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Se pregăteşte pentru ştergere inclusiv configurarea %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Şters inclusiv configurarea %s"
diff --git a/po/ru.po b/po/ru.po
index 9e874e6c0..3883ce239 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,14 +6,14 @@
 # Nikolai Prokoschenko <nikolai@prokoschenko.de>, 2004.
 # Dmitry Astapov <adept@umc.com.ua>, 2004.
 # Dmitry Astapov <adept@despammed.com>, 2004.
-# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005.
+# Yuri Kozlov <kozlov.y@gmail.com>, 2004, 2005, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-10-22 12:24+0400\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-01-21 14:55+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -155,14 +155,14 @@ msgstr "  Таблица версий:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s для %s %s скомпилирован %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -237,16 +237,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Задайте имя для этого диска, например 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Вставьте диск с меткой '%s' в устройство '%s' и нажмите ввод."
+msgstr "Вставьте диск в устройство и нажмите ввод"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+msgstr "Повторите этот процесс для всех имеющихся CD."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -300,7 +299,7 @@ msgid ""
 msgstr ""
 "Использование: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
-"apt-extracttemplates извлекает из пакетов Дебиан конфигурационные скрипты\n"
+"apt-extracttemplates извлекает из пакетов Debian конфигурационные скрипты\n"
 "и файлы-шаблоны\n"
 "\n"
 "Опции:\n"
@@ -531,7 +530,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Превышен лимит в %sB в DeLink.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Не удалось получить атрибуты %s"
@@ -646,80 +645,80 @@ 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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -727,151 +726,151 @@ 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 "Аутентификационное предупреждение не принято в внимание.\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
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
 msgstr "Внутренняя ошибка, Ordering не завершилась"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Невозможно заблокировать каталог для загрузки"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Не читается перечень источников."
 
-#: cmdline/apt-get.cc: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 "Необходимо скачать %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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Не удалось определить количество свободного места в %s"
 
-#: cmdline/apt-get.cc: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"
@@ -882,28 +881,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 "Хотите продолжить [Д/н]? "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Не удалось загрузить %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "Некоторые файлы не удалось загрузить"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -911,48 +910,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"
@@ -963,49 +962,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Команде update не нужны аргументы"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Невозможно заблокировать каталог со списками пакетов"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1013,27 +1012,27 @@ msgstr ""
 "Некоторые индексные файлы не загрузились, они были проигнорированы или "
 "вместо них были использованы старые версии"
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Внутренняя ошибка, AllUpgrade все поломал"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Не могу найти пакет %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Заметьте, регулярное выражение %2$s приводит к выбору %1$s\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -"
 "f install':"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1041,7 +1040,7 @@ msgstr ""
 "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', "
 "не указывая имени пакета, (или найдите другое решение)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1052,7 +1051,7 @@ msgstr ""
 "или же используете нестабильного дистрибутив, и запрошенные Вами пакеты\n"
 "ещё не созданы или были удалены из Incoming."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1062,120 +1061,125 @@ msgstr ""
 "пакет просто не может быть установлен из-за ошибок в самом пакете.\n"
 "Необходимо послать отчёт об этой ошибке."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Следующая информация возможно поможет Вам:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Будут установлены следующие дополнительные пакеты:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
-msgstr "Настойчиво рекомендуемые пакеты:"
+msgstr "Предлагаемые пакеты:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Рекомендуемые пакеты:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
-msgstr "Рассчёт обновлений... "
+msgstr "Расчёт обновлений... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Внутренняя ошибка, решатель проблем всё поломал"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Укажите как минимум один пакет, для которого необходимо загрузить исходные "
 "тексты"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Невозможно найти пакет с исходными текстами для %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Пропускаем уже загруженный файл '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Недостаточно места в %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо загрузить %sB/%sB из архивов исходных текстов.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Нужно загрузить %sB архивов с исходными текстами.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Загрузка исходных текстов %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Некоторые архивы не удалось загрузить."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Распаковка исходных текстов пропущена, так как в %s уже находятся "
 "распакованные исходные тексты\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Команда распаковки '%s' завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Команда сборки '%s' завершилась неудачно.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Порождённый процесс завершился неудачно"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Для проверки зависимостей для сборки необходимо указать как минимум один "
 "пакет"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Невозможно получить информацию о зависимостях для сборки %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s не имеет зависимостей для сборки.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1184,7 +1188,7 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не "
 "найден"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1193,32 +1197,32 @@ msgstr ""
 "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из "
 "версий пакета %s не удовлетворяет требованиям"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный "
 "пакет %s новее, чем надо"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимости для сборки %s не могут быть удовлетворены."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Обработка зависимостей для сборки завершилась неудачно"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Поддерживаемые модули:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1574,7 +1578,7 @@ msgstr "Не удалось сменить текущий каталог на а
 msgid "Internal error getting a package name"
 msgstr "Внутренняя ошибка при получении имени пакета"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Чтение списков файлов в пакете"
 
@@ -1620,10 +1624,6 @@ msgstr "Внутренняя ошибка при добавлении diversion"
 msgid "The pkg cache must be initialized first"
 msgstr "В первую очередь должен быть проинициализирован кэш пакетов"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Чтение списка файлов в пакете"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1696,12 +1696,12 @@ msgstr "Диск не найден."
 msgid "File not found"
 msgstr "Файл не найден"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Не удалось получить атрибуты"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Не удалось установить время модификации"
 
@@ -1833,7 +1833,7 @@ msgstr "Время установления соединения для соке
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Проблема при хэшировании файла"
 
@@ -1856,7 +1856,7 @@ msgstr "Передача данных завершилась неудачно, �
 msgid "Query"
 msgstr "Запрос"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Невозможно вызвать "
 
@@ -1885,74 +1885,75 @@ msgstr "Невозможно инициализировать соединени
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Не удаётся соединиться с %s:%s (%s), connection timed out"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Не удаётся соединиться с %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Соединение с %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Не могу найти IP адрес для %s"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Временная ошибка при попытке получить IP адрес '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 "Что-то странное произошло при попытке получить IP адрес для '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Невозможно соединиться с %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Не могу найти IP адрес для %s"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
 "работы."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток "
 "ключа?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "Найдена как минимум одна неправильная подпись."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Не удалось выполнить "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr "для проверки подписи (gnupg установлена?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Неизвестная ошибка при выполнении gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "Следующие подписи неверные:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1969,76 +1970,76 @@ msgstr "Не удалось открыть канал для %s"
 msgid "Read error from %s process"
 msgstr "Ошибка чтения из процесса %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Ожидание заголовков"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Получен заголовок длиннее %u символов"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Неверный заголовок"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-сервер послал неверный заголовок"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http сервер послал неверный заголовок Content-Length"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-сервер послал неверный заголовок Content-Range"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Этот http-сервер не поддерживает загрузку фрагментов файлов"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Неизвестный формат данных"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Ошибка в select"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Время ожидания для соединения истекло"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -2287,7 +2288,7 @@ msgstr "ПредЗависит"
 
 #: apt-pkg/pkgcache.cc:218
 msgid "Suggests"
-msgstr "Настойчиво рекомендует"
+msgstr "Предлагает"
 
 #: apt-pkg/pkgcache.cc:219
 msgid "Recommends"
@@ -2337,12 +2338,12 @@ msgstr "Версии-кандидаты"
 msgid "Dependency generation"
 msgstr "Генерирование зависимостей"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Невозможно прочесть содержимое пакета %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Невозможно прочесть содержимое пакета %s (2)"
@@ -2389,9 +2390,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Искажённая строка %u в списке источников %s (тип)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2443,11 +2444,18 @@ msgstr "Каталог %spartial отсутствует."
 msgid "Archive directory %spartial is missing."
 msgstr "Архивный каталог %spartial отсутствует."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Загружается файл %li из %li (%s осталось)"
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Чтение списков файлов в пакете"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2586,11 +2594,15 @@ msgstr "Ошибка ввода/вывода при попытке сохран�
 msgid "rename failed, %s (%s -> %s)."
 msgstr "переименовать не удалось, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum не совпадает"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Недоступен общий ключ для следующих ключей (ID):\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2599,7 +2611,7 @@ msgstr ""
 "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
 "придётся вручную исправить этот пакет (возможно, пропущен arch)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2608,13 +2620,13 @@ msgstr ""
 "Я не в состоянии обнаружить файл пакета %s. Это может означать, что Вам "
 "придётся вручную исправить этот пакет."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Некорректный перечень пакетов. Нет поля Filename: для пакета %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Не совпадает размер"
 
@@ -2762,15 +2774,27 @@ msgid "Removed %s"
 msgstr "Удалён %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Подготавливается для удаления вместе с настройками %s"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Подготавливается для конфигурации %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "Удалён вместе с настройками %s"
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Не удалось удалить %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Соединение закрыто преждевременно"
+
+#~ msgid "Reading file list"
+#~ msgstr "Чтение списка файлов в пакете"
+
+#~ msgid "Could not execute "
+#~ msgstr "Не удалось выполнить "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Подготавливается для удаления вместе с настройками %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Удалён вместе с настройками %s"
diff --git a/po/sk.po b/po/sk.po
index 38f3977f5..e1286b4e5 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-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-07-01 09:34+0200\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-05-29 15:33+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -146,14 +146,14 @@ msgstr "  Tabuľka verzií:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s pre %s %s skompilovaný na %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -229,19 +229,15 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+msgstr "Zadajte názov tohto disku, napríklad 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:93
-#, fuzzy
 msgid "Please insert a Disc in the drive 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 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 ""
+msgstr "Zopakujte tento proces pre všetky CD v sade diskov."
 
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
@@ -516,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Bol dosiahnutý odlinkovací limit %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "%s sa nedá vyhodnotiť"
@@ -630,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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!"
@@ -711,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 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:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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:1954
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, 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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -888,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"
@@ -938,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Príkaz update neprijíma žiadne argumenty"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Adresár zoznamov sa nedá zamknúť"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -988,25 +984,25 @@ msgstr ""
 "Niektoré indexové súbory sa nepodarilo stiahnuť, boli ignorované, alebo sa "
 "použili staršie verzie."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnútorná chyba, AllUpgrade pokazil veci"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Balík %s sa nedá nájsť"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, 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:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1014,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:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1026,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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1036,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:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Nainštalujú sa nasledovné extra balíky:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Odporúčané balíky:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Prepočítava sa aktualizácia... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Chyba"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
-#, fuzzy
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 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:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, 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:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Preskakuje sa už stiahnutý súbor '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, 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:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, 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:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stiahnuť zdroj %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Zlyhalo stiahnutie niektorých archívov."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Príkaz pre rozbalenie '%s' zlyhal.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, 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:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Príkaz pre zostavenie '%s' zlyhal.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Proces potomka zlyhal"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žiadne závislosti pre zostavenie.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1162,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:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Zlyhalo splnenie %s závislosti pre %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti pre zostavenie %s sa nedajú splniť."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Spracovanie závislostí pre zostavenie zlyhalo"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1435,9 +1435,9 @@ 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:96 apt-inst/dirstream.cc:104
 #, c-format
@@ -1539,7 +1539,7 @@ msgstr "Nedá sa zmeniť na admin adresár %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Vnútorná chyba pri získavaní názvu balíka"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Načítavam výpis súborov"
 
@@ -1583,14 +1583,9 @@ msgid "Internal error adding a diversion"
 msgstr "Vnútorná chyba pri pridávaní diverzie"
 
 #: apt-inst/deb/dpkgdb.cc:383
-#, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Načítavam zoznam súborov"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1656,20 +1651,19 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nedá sa odpojiť CD-ROM v %s - možno sa ešte používa."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Súbor nebol nájdený"
+msgstr "Disk sa nenašiel."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
-msgstr "Súbor nebol nájdený"
+msgstr "Súbor sa nenašiel"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Vyhodnotenie zlyhalo"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Zlyhalo nastavenie času zmeny"
 
@@ -1797,7 +1791,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hashovaním súboru"
 
@@ -1820,7 +1814,7 @@ msgstr "Prenos dát zlyhal, server odpovedal '%s'"
 msgid "Query"
 msgstr "Dotaz"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Nedá sa vyvolať "
 
@@ -1849,75 +1843,78 @@ msgstr "Nedá sa nadviazať spojenie na %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Nedá sa pripojiť k %s:%s (%s), uplynul čas spojenia"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Nedá sa pripojiť k %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Pripája sa k %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Nedá sa zistiť '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné zlyhanie pri zisťovaní '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Niečo veľmi zlé sa prihodilo pri zisťovaní '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Nedá sa pripojiť k %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Zväzok kľúčov '%s' je nedostupný."
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
+"CHYBA: zoznam argumentov z Acquire::gpgv::Options je príliš dlhý. Ukončuje "
+"sa."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgstr "Vnútorná chyba: Správna signatúra, ale sa nedá zistiť odtlačok kľúča?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Zámok %s sa nedá získať"
+msgstr "Bola zistená aspoň jedna nesprávna signatúra."
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "Nedá sa spustiť '%s' na kontrolu signatúry (je nainštalované gnupg?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Neznáma chyba pri spustení gpgv"
 
-#: methods/gpgv.cc:237
-#, fuzzy
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
-msgstr "Nainštalujú sa nasledovné extra balíky:"
+msgstr "Nasledovné signatúry sú neplatné:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 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
@@ -1929,76 +1926,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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Čaká sa na hlavičky"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Chybná hlavička"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
-msgstr "Http server poslal neplatnú hlavičku odpovede"
+msgstr "HTTP server poslal neplatnú hlavičku odpovede"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Http server poslal neplatnú hlavičku Content-Length"
+msgstr "HTTP server poslal neplatnú hlavičku Content-Length"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Http server poslal neplatnú hlavičku Content-Range"
+msgstr "HTTP server poslal neplatnú hlavičku Content-Range"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Tento HTTP server má poškodenú podporu rozsahov"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Neznámy formát dátumu"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Výber zlyhal"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Uplynul čas spojenia"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
@@ -2290,12 +2287,12 @@ msgstr "Kandidátske verzie"
 msgid "Dependency generation"
 msgstr "Generovanie závislostí"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Súbor %s sa nedá spracovať (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Súbor %s sa nedá spracovať (2)"
@@ -2341,7 +2338,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, 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"
 
@@ -2382,7 +2379,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
@@ -2394,10 +2391,17 @@ msgstr "Adresár zoznamov %spartial chýba."
 msgid "Archive directory %spartial is missing."
 msgstr "Archívny adresár %spartial chýba."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Sťahuje sa %li. súbor z %li (zostáva %s)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Sťahuje sa %li. súbor z %li"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2410,12 +2414,9 @@ 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:120
 #, c-format
@@ -2461,39 +2462,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."
@@ -2510,14 +2511,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
@@ -2542,11 +2543,15 @@ msgstr "V/V chyba pri ukladaní zdrojovej vyrovnávacej pamäte"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "premenovanie zlyhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Nezhoda MD5 súčtov"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Nie sú dostupné žiadne verejné kľúče ku kľúčom s nasledovnými ID:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2555,7 +2560,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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2564,13 +2569,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:814
+#: apt-pkg/acquire-item.cc:848
 #, 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:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Veľkosti sa nezhodujú"
 
@@ -2675,58 +2680,56 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Zapísaných %i záznamov s %i chýbajúcimi a %i chybnými súbormi\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Otvára sa %s"
+msgstr "Pripravuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Otvára sa %s"
+msgstr "Rozbaľuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Otvára sa konfiguračný súbor %s"
+msgstr "Pripravuje sa nastavenie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Pripája sa k %s"
+msgstr "Nastavuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Nainštalovaná verzia: "
+msgstr "Nainštalovaný balík %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Pripravuje sa odstránenie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Otvára sa %s"
+msgstr "Odstraňuje sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Odporúča"
+msgstr "Odstránený balík %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+msgid "Preparing to completely remove %s"
+msgstr "Pripravuje sa úplné odstránenie %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
-msgstr ""
+msgid "Completely removed %s"
+msgstr "Balík '%s' je úplne odstránený"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Spojenie bolo predčasne ukončené"
 
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Neznáme ID výrobcu '%s' na riadku %u v zdrojovom zozname %s"
diff --git a/po/sl.po b/po/sl.po
index 0e824b034..a8a458aff 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 "Last-Translator: Jure �uhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -143,14 +143,14 @@ msgstr " Tabela razli�ic:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s za %s %s preveden na %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -514,7 +514,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Dose�ena meja RazVezovanja %sB.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Napaka pri postavitvi %s"
@@ -628,79 +628,79 @@ msgstr "Napaka pri odvezovanju %s"
 msgid "Failed to rename %s to %s"
 msgstr "Ni mogo�e preimenovati %s v %s"
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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 nere�ene odvisnosti:"
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
 #, c-format
 msgid "but %s is installed"
 msgstr "vendar je paket %s name��en"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:329
 #, c-format
 msgid "but %s is to be installed"
 msgstr "vendar bo paket %s name��en"
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc: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 name��en"
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 msgid "but it is not going to be installed"
 msgstr "vendar ne bo name��en"
 
-#: 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 name��eni:"
 
-#: 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 zadr�ani:"
 
-#: 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 zadr�ani 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"
@@ -709,144 +709,144 @@ msgstr ""
 "OPOZORILO: Naslednji klju�ni paketi bodo odstranjeni.\n"
 "To NI priporo�ljivo, razen �e natan�no veste, kaj po�nete."
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu nadgrajenih, %lu na novo name��enih, "
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc: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 name��enih 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 mogo�e popraviti odvisnosti"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni mogo�e pomanj�ati zbirke za nadgradnjo"
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc: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 "Nere�ene 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 mogo�e 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 "Pri�lo je do te�av 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 onemogo�eno."
 
-#: 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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Ni mogo�e zakleniti imenika za prenose"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Seznama virov ni mogo�e 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 spro��enega %sB prostora na disku.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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 mo�nost 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"
@@ -857,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ni mogo�e 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:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "Prenos dokon�an in uporabljen na�in samo prenos"
 
-#: cmdline/apt-get.cc:984
+#: cmdline/apt-get.cc:986
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -886,47 +886,47 @@ msgstr ""
 "Nekaterih arhivov ni mogo�e dobiti. Poskusite uporabiti apt-get update ali --"
 "fix-missing."
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc: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 mogo�e popraviti manjkajo�ih 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 presko�en, ker je �e name��en 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 name��en, 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 " [Name��eno]"
 
-#: 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"
@@ -937,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 mo�na, ker ni mo�en prenos.\n"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1141
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Najnovej�a razli�ica %s je �e name��ena.\n"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Izdaje '%s' za '%s' ni mogo�e najti"
 
-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Razli�ice '%s' za '%s' ni mogo�e najti"
 
-#: cmdline/apt-get.cc:1174
+#: cmdline/apt-get.cc:1176
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Izbrana razli�ica %s (%s) za %s\n"
 
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Ukaz update ne potrebuje argumentov"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Imenika seznamov ni mogo�e zakleniti"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -987,25 +987,25 @@ msgstr ""
 "Nekaterih kazal ni mogo�e prenesti, zato so preklicana, ali pa so "
 "uporabljena starej�a."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ni mogo�e najti paketa %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Opomba: izbran %s namesto regex '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1013,7 +1013,7 @@ msgstr ""
 "Nere�ene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali "
 "podajte re�itev)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1024,7 +1024,7 @@ msgstr ""
 "nemogo� polo�aj, �e uporabljate nestabilno izdajo pa, da nekateri zahtevani "
 "paketi �e niso ustvarjeni ali prene�eni iz Prihajajo�e."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1034,125 +1034,130 @@ msgstr ""
 "preprosto ne da namestiti in je potrebno vlo�iti poro�ilo o hro��u\n"
 "o tem paketu."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "Naslednji podatki vam bodo morda pomagali re�iti te�avo:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Pokvarjeni paketi"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "Naslednji dodatni paketi bodo name��eni:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Predlagani paketi:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Priporo�eni paketi:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Prera�unavanje nadgradnje ... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Spodletelo"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Opravljeno"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Notranja napaka zaradi AllUpgrade."
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Izvornega paketa za %s ni mogo�e najti"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Odpakiranje �e odpakiranih izvornih paketov v %s presko�eno\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nimate dovolj prostora na %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potrebno je dobiti %sB izvornih arhivov.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Dobi vir %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Nekaterih arhivov ni mogo�e dobiti."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Odpakiranje �e odpakiranih izvornih paketov v %s presko�eno\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Ukaz odpakiranja '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Ukaz gradnje '%s' ni uspel.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Otro�ki proces ni uspel"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni mogo�e dobiti informacij o odvisnostih za gradnjo za %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nima odvisnosti za gradnjo.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s odvisnosti za %s ni mogo�e zadostiti, ker ni mogo�e najti paketa %s"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,31 +1166,31 @@ msgstr ""
 "%s odvisnosti za %s ni mogo�e zadostiti, ker nobena razli�ica paketa %s ne "
 "more zadostiti zahtevi po razli�ici"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Ni mogo�e zadostiti %s odvisnosti za %s. Name��en paket %s je preve� nov"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Ni mogo�e zadostiti %s odvisnosti za %s. %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Odvisnostim za gradnjo %s ni mogo�e zadostiti."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Obdelava odvisnosti za gradnjo ni uspela"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Podprti moduli:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1540,7 +1545,7 @@ msgstr "Premik v skrbnikov imenik %sinfo ni uspel"
 msgid "Internal error getting a package name"
 msgstr "Notranja napaka pri sprejemanju imena paketa"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Branje seznama datotek"
 
@@ -1586,10 +1591,6 @@ msgstr "Notranja napaka pri dodajanju odklona"
 msgid "The pkg cache must be initialized first"
 msgstr "Najprej se mora izvesti predpomnilnik paketov"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Branje seznama datotek"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1663,12 +1664,12 @@ msgstr "Datoteke ni mogo�e najti"
 msgid "File not found"
 msgstr "Datoteke ni mogo�e najti"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Dolo�itev ni uspela"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Nastavitev �asa spremembe ni uspela"
 
@@ -1796,7 +1797,7 @@ msgstr "Povezava podatkovne vti�nice potekla"
 msgid "Unable to accept connection"
 msgstr "Ni mogo�e sprejeti povezave"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Te�ava pri razpr�evanju datoteke"
 
@@ -1819,7 +1820,7 @@ msgstr "Prenos podatkov ni uspel, stre�nik je odgovoril '%s'"
 msgid "Query"
 msgstr "Poizvedba"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Ni mogo�e zagnati "
 
@@ -1848,71 +1849,71 @@ msgstr "Ni mogo�e za�eti povezave z %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Ni se mogo�e povezati z %s:%s (%s). Povezava potekla."
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Ni se mogo�e povezati z %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Povezujem se z %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Ni mogo�e razre�iti '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Za�asna napaka pri razre�evanju '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Pri�lo je do napake pri razre�evanju '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Ni se mogo�e povezati z %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Ni mogo�e razre�iti '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "Ni mogo�e dobiti zaklenjene datoteke %s"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Naslednji dodatni paketi bodo name��eni:"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1928,76 +1929,76 @@ msgstr "Ni mogo�e odprti %s"
 msgid "Read error from %s process"
 msgstr "Napaka pri branju iz procesa %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "�akanje na glave"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Napa�na vrstica glave"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Stre�nik HTTP je poslal napa�no glavo odgovora"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Stre�nik HTTP je poslal glavo z napa�no dol�ino vsebine"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Stre�nik HTTP je poslal glavo z napa�nim obsegom vsebine"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Ta stre�nik HTTP ima pokvarjen obseg podpore"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Neznana oblika datuma"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Izbira ni uspela"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "�as za povezavo se je iztekel"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Napaka pri pisanju v izhodno datoteko"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Napaka pri pisanju v datoteko"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Napaka pri pisanju v datoteko"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka pri branju oddaljene in zaprte povezave s stre�nika "
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Napaka pri branju s stre�nika"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Napa�ni podatki glave"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Notranja napaka"
 
@@ -2289,12 +2290,12 @@ msgstr "Razli�ice kandidatov"
 msgid "Dependency generation"
 msgstr "Ustvarjanje odvisnosti"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ni mogo�e raz�leniti paketne datoteke %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni mogo�e raz�leniti paketne datoteke %s (2)"
@@ -2394,11 +2395,18 @@ msgstr "Manjka imenik s seznami %spartial."
 msgid "Archive directory %spartial is missing."
 msgstr "Manjka imenik z arhivi %spartial."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Branje seznama datotek"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2540,11 +2548,15 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "preimenovanje spodletelo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Neujemanje vsote MD5"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2553,7 +2565,7 @@ msgstr ""
 "Ni bilo mogo�e najti datoteke za paket %s. Morda boste morali ro�no "
 "popraviti ta paket (zaradi manjkajo�ega arhiva)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2562,7 +2574,7 @@ msgstr ""
 "Ni bilo mogo�e najti datoteke za paket %s. Morda boste morali ro�no "
 "popraviti ta paket."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2570,7 +2582,7 @@ msgstr ""
 "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket "
 "%s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Neujemanje velikosti"
 
@@ -2716,18 +2728,25 @@ msgid "Removed %s"
 msgstr "Priporo�a"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Odpiranje nastavitvene datoteke %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Odstranitev %s ni uspela"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Povezava se je prezgodaj zaprla"
 
+#~ msgid "Reading file list"
+#~ msgstr "Branje seznama datotek"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Ni mogo�e dobiti zaklenjene datoteke %s"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "Neznan ID ponudnika '%s' v vrstici %u v seznamu virov %s"
diff --git a/po/sv.po b/po/sv.po
index b069c929c..7ab4104ad 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,15 +1,16 @@
 # Advanced Package Tool - APT message translation catalog
 # Swedish messages
 # Peter Karlsson <peterk@debian.org>, 2002-2005.
+# Daniel Nylander <po@danielnylander.se>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-11-02 23:56+0100\n"
+"POT-Creation-Date: 2006-05-08 11:02+0200\n"
+"PO-Revision-Date: 2006-05-18 08:35+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <sv@li.org>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +20,12 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paket %s version %s har ett beroende som inte kan tillfredsst�llas:\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: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"
@@ -82,7 +87,8 @@ msgstr "Totalt bortkastat utrymme: "
 msgid "Total space accounted for: "
 msgstr "Totalt utrymme som kan redog�ras f�r: "
 
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:446
+#: cmdline/apt-cache.cc:1189
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Paketfilen %s �r ur synk."
@@ -99,7 +105,8 @@ msgstr "Inga paket funna"
 msgid "Package files:"
 msgstr "\"Package\"-filer:"
 
-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1469
+#: cmdline/apt-cache.cc:1555
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cachen �r ur synk, kan inte korsreferera en paketfil"
 
@@ -114,7 +121,8 @@ msgstr "%4i %s\n"
 msgid "Pinned packages:"
 msgstr "Fastn�lade paket:"
 
-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1494
+#: cmdline/apt-cache.cc:1535
 msgid "(not found)"
 msgstr "(ej funnen)"
 
@@ -123,7 +131,8 @@ msgstr "(ej funnen)"
 msgid "  Installed: "
 msgstr "  Installerad: "
 
-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1517
+#: cmdline/apt-cache.cc:1525
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -146,14 +155,18 @@ msgstr "  Versionstabell:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1652
+#: cmdline/apt-cdrom.cc:138
+#: cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225
+#: ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369
+#: cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s f�r %s %s kompilerad den %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -300,7 +313,8 @@ msgstr ""
 "  -c=? L�s denna inst�llningsfil.\n"
 "  -o=? Ange valfri inst�llningsflagga. T.ex -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267
+#: apt-pkg/pkgcachegen.cc:710
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kunde inte skriva till %s"
@@ -309,13 +323,17 @@ msgstr "Kunde inte skriva till %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan inte ta reda p� debconfs version. �r debconf installerat?"
 
-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+#: ftparchive/apt-ftparchive.cc:167
+#: ftparchive/apt-ftparchive.cc:341
 msgid "Package extension list is too long"
 msgstr "Listan �ver filtill�gg f�r Packages �r f�r l�ng"
 
-#: 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
+#: 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 "Fel vid behandling av katalogen %s"
@@ -474,7 +492,8 @@ msgstr "V: "
 msgid "E: Errors apply to file "
 msgstr "F: Felen g�ller filen "
 
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:151
+#: ftparchive/writer.cc:181
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Misslyckades att sl� upp %s"
@@ -514,8 +533,12 @@ msgstr "*** Misslyckades att l�nka %s till %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Avl�nkningsgr�ns p� %sB n�dd.\n"
 
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: ftparchive/writer.cc:358
+#: apt-inst/extract.cc:181
+#: apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210
+#: apt-inst/deb/dpkgdb.cc:121
+#: methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Misslyckades att ta status p� %s"
@@ -525,13 +548,15 @@ msgstr "Misslyckades att ta status p� %s"
 msgid "Archive had no package field"
 msgstr "Arkivet har inget package-f�lt"
 
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: 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:689
+#: ftparchive/writer.cc:437
+#: ftparchive/writer.cc:689
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  ansvarig f�r %s �r %s ej %s\n"
@@ -541,32 +566,38 @@ msgstr "  ansvarig f�r %s �r %s ej %s\n"
 msgid "Internal error, could not locate member %s"
 msgstr "Internt fel, kunde inta hitta delen %s"
 
-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:353
+#: ftparchive/contents.cc:384
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Misslyckades att allokera minne"
 
-#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#: ftparchive/override.cc:38
+#: ftparchive/override.cc:146
 #, c-format
 msgid "Unable to open %s"
 msgstr "Kunde inte �ppna %s"
 
 # parametrar: filnamn, radnummer
-#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#: ftparchive/override.cc:64
+#: ftparchive/override.cc:170
 #, c-format
 msgid "Malformed override %s line %lu #1"
 msgstr "Felaktig override %s rad %lu #1"
 
-#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#: ftparchive/override.cc:78
+#: ftparchive/override.cc:182
 #, c-format
 msgid "Malformed override %s line %lu #2"
 msgstr "Felaktig override %s rad %lu #2"
 
-#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#: ftparchive/override.cc:92
+#: ftparchive/override.cc:195
 #, c-format
 msgid "Malformed override %s line %lu #3"
 msgstr "Felaktig override %s rad %lu #3"
 
-#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#: ftparchive/override.cc:131
+#: ftparchive/override.cc:205
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr "Misslyckades att l�sa override-filen %s"
@@ -582,7 +613,8 @@ msgstr "Ok�nd komprimeringsalgoritm \"%s\""
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimerad utdata %s beh�ver en komprimeringsupps�ttning"
 
-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:172
+#: methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Misslyckades att skapa IPC-r�r till underprocess"
 
@@ -628,84 +660,86 @@ msgstr "Misslyckades att l�sa vid ber�kning av MD5"
 msgid "Problem unlinking %s"
 msgstr "Problem med att l�nka ut %s"
 
-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:490
+#: apt-inst/extract.cc:188
 #, c-format
 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:1513
+#: cmdline/apt-get.cc:142
+#: cmdline/apt-get.cc:1506
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid tolkning av regulj�rt uttryck - %s"
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:237
 msgid "The following packages have unmet dependencies:"
 msgstr "F�ljande paket har beroenden som inte kan tillfredsst�llas:"
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc: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 "F�ljande NYA paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 msgstr "F�ljande paket kommer att TAS BORT:"
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 msgid "The following packages have been kept back:"
 msgstr "F�ljande paket har h�llits tillbaka:"
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:444
 msgid "The following packages will be upgraded:"
 msgstr "F�ljande paket kommer att uppgraderas:"
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be DOWNGRADED:"
 msgstr "F�ljande paket kommer att NEDGRADERAS:"
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:485
 msgid "The following held packages will be changed:"
 msgstr "F�ljande h�llna paket kommer att �ndras:"
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc: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!"
@@ -713,145 +747,150 @@ msgstr ""
 "VARNING: F�ljande systemkritiska paket kommer att tas bort\n"
 "Detta b�r INTE g�ras s�vida du inte vet exakt vad du g�r!"
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc: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 "R�ttar 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 r�tta beroenden"
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
 msgid "Unable to minimize the upgrade set"
 msgstr "Kunde inte minimera uppgraderingsupps�ttningen"
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
 msgid " Done"
 msgstr " F�rdig"
 
-#: 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 m�jligen r�tta dessa genom att k�ra \"apt-get -f install\"."
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
 msgid "Unmet dependencies. Try using -f."
 msgstr "Otillfredsst�llda beroenden. F�rs�k med -f."
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:689
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "VARNING: F�ljande paket kunde inte autentiseras!"
 
-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693
 msgid "Authentication warning overridden.\n"
 msgstr "Authentiseringsvarning �verk�rd.\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 "N�gra 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 uppst�tt och -y anv�ndes 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 m�ste 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 f�rdigst�lldes inte"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791
+#: cmdline/apt-get.cc:1800
+#: cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte l�sa h�mtningskatalogen."
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:1881
+#: cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "Listan �ver k�llor kunde inte l�sas."
 
-#: 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 st�mde inte, skicka e-post till apt@packages.debian."
-"org"
+msgstr "Konstigt.. storlekarna st�mde inte, skicka e-post till apt@packages.debian.org"
 
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Beh�ver h�mta %sB/%sB arkiv.\n"
 
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:824
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Beh�ver h�mta %sB arkiv.\n"
 
-#: cmdline/apt-get.cc:827
+#: cmdline/apt-get.cc:829
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr "Efter uppackning kommer %sB ytterligare diskutrymme anv�ndas.\n"
 
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Efter uppackning kommer %sB frig�ras p� disken.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:1971
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunde inte l�sa av ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:849
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har inte tillr�ckligt ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc: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, g�r som jag s�ger!"
 
-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -859,81 +898,80 @@ msgid ""
 " ?] "
 msgstr ""
 "Du �r p� v�g att g�ra n�got som kan vara skadligt\n"
-"Skriv frasen '%s' f�r att forts�tta\n"
+"Skriv frasen \"%s\" f�r att forts�tta\n"
 " ?] "
 
 # Visas d� man svarar nej
-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc: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 forts�tta [J/n]? "
 
-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961
+#: cmdline/apt-get.cc:1365
+#: cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades att h�mta %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "Misslyckades att h�mta vissa filer"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 msgstr "H�mtningen f�rdig i \"endast-h�mta\"-l�ge"
 
-#: cmdline/apt-get.cc:984
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Vissa arkiv kunte inte h�mtas. Pr�va eventuellt \"apt-get update\" eller med "
-"--fix-missing."
+#: cmdline/apt-get.cc:986
+msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?"
+msgstr "Vissa arkiv kunte inte h�mtas. Pr�va eventuellt \"apt-get update\" eller med --fix-missing."
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing och mediabyte st�ds inte �nnu"
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:995
 msgid "Unable to correct missing packages."
 msgstr "Kunde inte r�tta 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, v�ljer %s ist�llet f�r %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"
+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 tillhandah�lls 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 b�r 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"
@@ -944,83 +982,76 @@ msgstr ""
 "Detta betyder vanligen att paketet saknas, har blivit f�r�ldrat eller\n"
 "bara �r tillg�ngligt fr�n andra k�llor\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr "Dock kan f�ljande paket ers�tta det:"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc: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 m�jlig, det kan inte h�mtas.\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 "Utg�van \"%s\" f�r \"%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\" f�r \"%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) f�r %s\n"
 
-#: cmdline/apt-get.cc:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "Uppdateringskommandot tar inga argument"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Kunde inte l�sa listkatalogen"
 
-#: cmdline/apt-get.cc:1382
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Vissa indexfiler kunde inte h�mtas, de har ignorerats eller s� har de gamla "
-"anv�nts ist�llet."
+#: cmdline/apt-get.cc:1384
+msgid "Some index files failed to download, they have been ignored, or old ones used instead."
+msgstr "Vissa indexfiler kunde inte h�mtas, de har ignorerats eller s� har de gamla anv�nts ist�llet."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internt fel, AllUpgrade f�rst�rde n�got"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunde inte hitta paketet %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Observera, v�ljer %s f�r regex \"%s\"\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du kan m�jligen r�tta detta genom att k�ra \"apt-get -f install\":"
 
-#: cmdline/apt-get.cc:1556
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Otillfredsst�llda beroenden. F�rs�k med \"apt-get -f install\" utan paket "
-"(eller ange en l�sning)."
+#: cmdline/apt-get.cc:1549
+msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."
+msgstr "Otillfredsst�llda beroenden. F�rs�k med \"apt-get -f install\" utan paket (eller ange en l�sning)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1032,7 +1063,7 @@ msgstr ""
 "distributionen, att n�gra kr�vda paket �nnu inte har skapats eller\n"
 "lagts in fr�n \"Incoming\"."
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1042,156 +1073,156 @@ msgstr ""
 "helt enkelt inte kan installeras och att en felrapport om detta b�r\n"
 "skrivas."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "F�ljande information kan vara till hj�lp f�r att l�sa situationen:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Trasiga paket"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "F�ljande ytterligare paket kommer att installeras:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "F�reslagna paket:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Rekommenderade paket:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "Ber�knar uppgradering... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698
+#: methods/ftp.cc:702
+#: methods/connect.cc:101
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "F�rdig"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768
+#: cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internt fel, probleml�saren br�t s�nder saker"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du m�ste ange �tminstone ett paket att h�mta k�llkod f�r"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunde inte hitta n�got k�llkodspaket f�r %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Hoppar �ver redan h�mtad fil \"%s\"\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har inte tillr�ckligt ledigt utrymme i %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Beh�ver h�mta %sB/%sB k�llkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Beh�ver h�mta %sB k�llkodsarkiv.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "H�mtar k�llkod %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Misslyckades att h�mta vissa arkiv."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Packar inte upp redan redan uppackad k�llkod i %s\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Kontrollera om paketet 'dpkg-dev' �r installerat.\n"
+msgstr "Kontrollera att paketet \"dpkg-dev\" �r installerat.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggkommandot \"%s\" misslyckades.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Barnprocessen misslyckades"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du m�ste ange �tminstone ett paket att inh�mta byggberoenden f�r"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunde inte h�mta byggberoendeinformation f�r %s"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"%s-beroendet p� %s kan inte tillfredsst�llas eftersom paketet %s inte hittas"
+msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found"
+msgstr "%s-beroendet p� %s kan inte tillfredsst�llas eftersom paketet %s inte hittas"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-msgstr ""
-"%s-beroendet p� %s kan inte tillfredsst�llas eftersom inga tillg�ngliga "
-"versioner av paketet %s uppfyller versionskraven"
+msgid "%s dependency for %s cannot be satisfied because no available versions of package %s can satisfy version requirements"
+msgstr "%s-beroendet p� %s kan inte tillfredsst�llas eftersom inga tillg�ngliga versioner av paketet %s uppfyller versionskraven"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr ""
-"Misslyckades att uppfylla %s-beroendet f�r %s: Det installerade paketet %s "
-"�r f�r nytt"
+msgstr "Misslyckades att uppfylla %s-beroendet f�r %s: Det installerade paketet %s �r f�r nytt"
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Misslyckades att uppfylla %s-beroendet f�r %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggberoenden f�r %s kunde inte uppfyllas."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Kunde inte hantera byggberoenden"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Moduler som st�ds:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1344,8 +1375,12 @@ msgstr ""
 msgid "Bad default setting!"
 msgstr "Ogiltig standardinst�llning!"
 
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51
+#: dselect/install:83
+#: dselect/install:87
+#: dselect/install:93
+#: dselect/install:104
+#: dselect/update:45
 msgid "Press enter to continue."
 msgstr "Tryck Enter f�r att forts�tta."
 
@@ -1365,8 +1400,7 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "saknade beroenden. Detta �r okej, bara felen ovanf�r detta"
 
 #: 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 "meddelande �r viktiga. F�rs�k r�tta dem och [I]nstallera igen"
 
 #: dselect/update:30
@@ -1381,7 +1415,8 @@ msgstr "Misslyckades att skapa r�r"
 msgid "Failed to exec gzip "
 msgstr "Misslyckades att k�ra gzip"
 
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:180
+#: apt-inst/contrib/extracttar.cc:206
 msgid "Corrupted archive"
 msgstr "F�rd�rvat arkiv"
 
@@ -1402,7 +1437,8 @@ msgstr "Ogiltig arkivsignatur"
 msgid "Error reading archive member header"
 msgstr "Misslyckades att l�sa huvud f�r arkivdel"
 
-#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+#: apt-inst/contrib/arfile.cc:93
+#: apt-inst/contrib/arfile.cc:105
 msgid "Invalid archive member header"
 msgstr "Ogiltigt arkivdelshuvud"
 
@@ -1446,17 +1482,21 @@ msgstr "Omdirigering %s -> %s inlagd tv� g�nger"
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicerad konfigurationsfil %s/%s"
 
-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:45
+#: apt-inst/dirstream.cc:50
+#: apt-inst/dirstream.cc:53
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Misslyckades att skriva filen %s"
 
-#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#: apt-inst/dirstream.cc:96
+#: apt-inst/dirstream.cc:104
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Misslyckades att st�nga filen %s"
 
-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:96
+#: apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
 msgstr "S�kv�gen %s �r f�r l�ng"
@@ -1476,7 +1516,8 @@ msgstr "Katalogen %s �r omdirigerad"
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Paketet f�rs�ker skriva till omdirigeringsm�let %s/%s"
 
-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:157
+#: apt-inst/extract.cc:300
 msgid "The diversion path is too long"
 msgstr "Omdirigeringss�kv�gen �r f�r l�ng"
 
@@ -1504,9 +1545,12 @@ msgstr "Skriver �ver pakettr�ff utan version f�r %s"
 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/sourcelist.cc:324
-#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#: 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 "Kunde inte l�sa %s"
@@ -1516,12 +1560,14 @@ msgstr "Kunde inte l�sa %s"
 msgid "Unable to stat %s"
 msgstr "Kunde inte ta status p� %s"
 
-#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#: apt-inst/deb/dpkgdb.cc:55
+#: apt-inst/deb/dpkgdb.cc:61
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Misslyckades att ta bort %s"
 
-#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#: apt-inst/deb/dpkgdb.cc:110
+#: apt-inst/deb/dpkgdb.cc:112
 #, c-format
 msgid "Unable to create %s"
 msgstr "Kunde inte skapa %s"
@@ -1536,8 +1582,10 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Katalogerna info och temp m�ste ligga p� samma filsystem"
 
 #. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-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 "L�ser paketlistor"
@@ -1548,26 +1596,24 @@ msgstr "L�ser paketlistor"
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Kunde inte g� till adminkatalogen %sinfo"
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: 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 "Internt fel n�r namn p� Package-fil skulle h�mtas"
 
 #: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "L�ser fillista"
 
 #: 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 ""
-"Misslyckades att �ppna listfilen \"%sinfo/%s\". Om du inte kan �terskapa "
-"filen, skapa en tom och installera omedelbart om samma version av paketet!"
+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 "Misslyckades att �ppna listfilen \"%sinfo/%s\". Om du inte kan �terskapa filen, skapa en tom och installera omedelbart om samma version av paketet!"
 
-#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#: apt-inst/deb/dpkgdb.cc:229
+#: apt-inst/deb/dpkgdb.cc:242
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Misslyckades att l�sa listfilen %sinfo/%s"
@@ -1585,7 +1631,8 @@ msgstr "Misslyckades att �ppna omdirigeringsfilen %sdiversions"
 msgid "The diversion file is corrupted"
 msgstr "Omdirigeringsfilen �r trasig"
 
-#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: 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"
@@ -1599,10 +1646,6 @@ msgstr "Internt fel n�r en omdirigering skulle l�ggas till"
 msgid "The pkg cache must be initialized first"
 msgstr "Paketcachen m�ste ha initierats f�rst"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "L�ser fillista"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1618,7 +1661,8 @@ msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu"
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Fel vid tolkning av MD5. Offset %lu"
 
-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: 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 "Detta �r inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
@@ -1652,12 +1696,8 @@ msgid "Unable to read the cdrom database %s"
 msgstr "Kunde inte l�sa cd-rom-databasen %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 ""
-"Anv�nd apt-cdrom f�r att APT ska k�nna igen denna cd. apt-get update kan "
-"inte anv�ndas f�r att l�gga till skivor"
+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 "Anv�nd apt-cdrom f�r att APT ska k�nna igen denna cd. apt-get update kan inte anv�ndas f�r att l�gga till skivor"
 
 #: methods/cdrom.cc:131
 msgid "Wrong CD-ROM"
@@ -1672,16 +1712,22 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anv�nds."
 msgid "Disk not found."
 msgstr "Disk ej funnen."
 
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:177
+#: methods/file.cc:79
+#: methods/rsh.cc:264
 msgid "File not found"
 msgstr "Filen ej funnen"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42
+#: methods/gpgv.cc:275
+#: methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Kunde inte ta status"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79
+#: methods/gpgv.cc:272
+#: methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Misslyckades s�tta modifieringstid"
 
@@ -1702,7 +1748,8 @@ msgstr "Kunde inte ta reda p� namn p� partner"
 msgid "Unable to determine the local name"
 msgstr "Kunde inte ta reda p� eget namn"
 
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:204
+#: methods/ftp.cc:232
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Servern nekade anslutningen och sade: %s"
@@ -1718,12 +1765,8 @@ msgid "PASS failed, server said: %s"
 msgstr "PASS misslyckades, servern sade: %s"
 
 #: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
-"ProxyLogin �r tom."
+msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty."
+msgstr "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::ProxyLogin �r tom."
 
 #: methods/ftp.cc:265
 #, c-format
@@ -1735,7 +1778,10 @@ msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s"
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE misslyckades, servern sade: %s"
 
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:329
+#: methods/ftp.cc:440
+#: methods/rsh.cc:183
+#: methods/rsh.cc:226
 msgid "Connection timeout"
 msgstr "Inget svar p� f�rbindelsen inom tidsgr�nsen"
 
@@ -1743,23 +1789,31 @@ msgstr "Inget svar p� f�rbindelsen inom tidsgr�nsen"
 msgid "Server closed the connection"
 msgstr "Servern st�ngde f�rbindelsen"
 
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: methods/ftp.cc:338
+#: apt-pkg/contrib/fileutl.cc:471
+#: methods/rsh.cc:190
 msgid "Read error"
 msgstr "L�sfel"
 
-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:345
+#: methods/rsh.cc:197
 msgid "A response overflowed the buffer."
 msgstr "Ett svar spillde bufferten."
 
-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:362
+#: methods/ftp.cc:374
 msgid "Protocol corruption"
 msgstr "Protokollet f�rd�rvat"
 
-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: methods/ftp.cc:446
+#: apt-pkg/contrib/fileutl.cc:510
+#: methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:687
+#: methods/ftp.cc:693
+#: methods/ftp.cc:729
 msgid "Could not create a socket"
 msgstr "Kunde inte skapa uttag (socket)"
 
@@ -1809,7 +1863,9 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr�ns"
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutning"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864
+#: methods/http.cc:958
+#: methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem med att l�gga filen till hashtabellen"
 
@@ -1818,7 +1874,8 @@ msgstr "Problem med att l�gga filen till hashtabellen"
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Kunde inte h�mta filen, servern sade \"%s\""
 
-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:892
+#: methods/rsh.cc:322
 msgid "Data socket timed out"
 msgstr "Datauttag (socket) fick inte svar inom tidsgr�ns"
 
@@ -1833,7 +1890,7 @@ msgstr "Data�verf�ring misslyckades, servern sade \"%s\""
 msgid "Query"
 msgstr "Fr�gar"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
@@ -1864,77 +1921,73 @@ msgstr "Kunde inte p�b�rja anslutning till %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Kunde inte ansluta till %s:%s (%s), tog f�r l�ng tid"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Kunde inte ansluta till %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136
+#: methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Kunde inte sl� upp \"%s\""
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Tempor�rt fel vid uppslagning av \"%s\""
 
 # Ok�nd felkod; %i = koden
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "N�got ot�ckt h�nde n�r \"%s:%s\" slogs upp (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Kunde inte ansluta till %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Kunde inte komma �t nyckelring: \"%s\""
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "E: Argumentslistan fr�n Acquire::gpgv::Options f�r l�ng. Avslutar."
 
-#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
+#: methods/gpgv.cc:198
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "�tminstone en giltig signatur tr�ffades p�."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Kunde inte exekvera "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr " f�r att verifiera signature (�r gnupg installerad?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "Kunde inte starta \"%s\" f�r att verifiera signatur (�r gnupg installerad?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Ok�nt fel vid exekvering av gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "F�ljande signaturer �r ogiltiga:\n"
 
-#: methods/gpgv.cc:244
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
-"F�ljande signaturer kunde inte verifieras f�r att den publika nyckeln inte "
-"�r tillg�nglig:\n"
+#: methods/gpgv.cc:250
+msgid "The following signatures couldn't be verified because the public key is not available:\n"
+msgstr "F�ljande signaturer kunde inte verifieras f�r att den publika nyckeln inte �r tillg�nglig:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -1947,76 +2000,77 @@ msgstr "Kunde inte �ppna r�r f�r %s"
 msgid "Read error from %s process"
 msgstr "L�sfel p� %s-processen"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "V�ntar p� huvuden"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Fick en ensam huvudrad p� %u tecken"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Trasig huvudrad"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549
+#: methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Http-servern s�nde ett ogiltigt svarshuvud"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Http-servern s�nde ett ogiltigt Content-Length-huvud"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Http-servern s�nde ett ogiltigt Content-Range-huvud"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Denna http-servers st�d f�r delvis h�mtning fungerar inte"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Ok�nt datumformat"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "\"Select\" misslyckades"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Tidsgr�nsen f�r anslutningen n�ddes"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fel vid l�sning fr�n server: Andra �nden st�ngde f�rbindelsen"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Fel vid l�sning fr�n server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Trasigt data i huvud"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Anslutning misslyckades"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -2074,7 +2128,8 @@ msgstr "Syntaxfel %s:%u: Direktiv kan endast utf�ras p� toppniv�n"
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaxfel %s:%u: F�r m�nga n�stlade inkluderingar"
 
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#: apt-pkg/contrib/configuration.cc:695
+#: apt-pkg/contrib/configuration.cc:700
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaxfel %s:%u: Inkluderad h�rifr�n"
@@ -2104,7 +2159,8 @@ msgstr "%c%s... F�rdig"
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kommandoradsflagga \"%c\" [fr�n %s] �r ej k�nd."
 
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: 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"
@@ -2115,12 +2171,14 @@ msgstr "F�rst�r inte kommandoradsflaggan %s"
 msgid "Command line option %s is not boolean"
 msgstr "Kommandoradsflaggan %s �r inte boolsk"
 
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Flaggan %s kr�ver ett v�rde."
 
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#: 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 "Flagga %s: Den angivna konfigurationsposten m�ste inneh�lla =<v�rde>."
@@ -2151,7 +2209,9 @@ msgid "Unable to stat the mount point %s"
 msgstr "Kunde inte ta status p� monteringspunkt %s."
 
 # Felmeddelande f�r misslyckad chdir
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 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"
@@ -2293,13 +2353,14 @@ msgstr "normalt"
 
 #: apt-pkg/pkgcache.cc:232
 msgid "optional"
-msgstr "valbart"
+msgstr "valfri"
 
 #: apt-pkg/pkgcache.cc:232
 msgid "extra"
 msgstr "extra"
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:60
+#: apt-pkg/depcache.cc:89
 msgid "Building dependency tree"
 msgstr "Bygger beroendetr�d"
 
@@ -2311,12 +2372,12 @@ msgstr "Kandiderande versioner"
 msgid "Dependency generation"
 msgstr "Beroendegenerering"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Kunde inte tolka paketfilen %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Kunde inte tolka paketfilen %s (2)"
@@ -2351,7 +2412,8 @@ msgstr "Rad %lu i k�llistan %s har fel format (dist-tolkning)"
 msgid "Opening %s"
 msgstr "�ppnar %s"
 
-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:220
+#: apt-pkg/cdrom.cc:426
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Rad %u f�r l�ng i k�llistan %s."
@@ -2362,26 +2424,20 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Rad %u i k�llistan %s har fel format (typ)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen \"%s\" �r ok�nd p� rad %u i k�llistan %s"
+msgstr "Typ \"%s\" �r ok�nd p� rad %u i listan �ver k�llor %s"
 
-#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#: apt-pkg/sourcelist.cc:252
+#: apt-pkg/sourcelist.cc:255
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Rad %u i k�llistan %s har fel format (leverant�rs-id)"
 
 #: 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 ""
-"F�r att genomf�ra denna installation m�ste det systemkritiska paketet %s "
-"tillf�lligt tas bort p� grund av en beroendespiral i Conflicts/Pre-Depends. "
-"Detta �r oftast en d�lig id�, men om du verkligen vill g�ra det kan du "
-"aktivera flaggan \"APT::Force-LoopBreak\"."
+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 "F�r att genomf�ra denna installation m�ste det systemkritiska paketet %s tillf�lligt tas bort p� grund av en beroendespiral i Conflicts/Pre-Depends. Detta �r oftast en d�lig id�, men om du verkligen vill g�ra det kan du aktivera flaggan \"APT::Force-LoopBreak\"."
 
 #: apt-pkg/pkgrecords.cc:37
 #, c-format
@@ -2390,18 +2446,12 @@ msgstr "Indexfiler av typ \"%s\" st�ds inte"
 
 #: 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 ""
-"Paketet %s m�ste installeras om, men jag kan inte hitta n�got arkiv f�r det."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Paketet %s m�ste installeras om, men jag kan inte hitta n�got arkiv f�r det."
 
 #: apt-pkg/algorithms.cc:1059
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p� "
-"h�llna paket."
+msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages."
+msgstr "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p� h�llna paket."
 
 #: apt-pkg/algorithms.cc:1061
 msgid "Unable to correct problems, you have held broken packages."
@@ -2417,10 +2467,17 @@ msgstr "Listkatalogen %spartial saknas."
 msgid "Archive directory %spartial is missing."
 msgstr "Arkivkatalogen %spartial saknas."
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "H�mtar fil %li av %li (%s �terst�r)"
+
+#: apt-pkg/acquire.cc:825
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr "Laddar ner fil %li av %li (%s �terst�r)"
+msgid "Retrieving file %li of %li"
+msgstr "H�mtar fil %li av %li"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2435,7 +2492,7 @@ msgstr "Metoden %s startade inte korrekt"
 #: apt-pkg/acquire-worker.cc:377
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter."
+msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter."
 
 #: apt-pkg/init.cc:120
 #, c-format
@@ -2555,7 +2612,8 @@ msgstr "Kunde inte ta status p� k�llkodspaketlistan %s"
 msgid "Collecting File Provides"
 msgstr "Samlar filberoenden"
 
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:785
+#: apt-pkg/pkgcachegen.cc:792
 msgid "IO Error saving source cache"
 msgstr "In-/utfel vid lagring av k�llcache"
 
@@ -2564,35 +2622,31 @@ msgstr "In-/utfel vid lagring av k�llcache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "namnbyte misslyckades, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236
+#: apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5-kontrollsumma st�mmer inte"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Det finns ingen publik nyckel tillg�nglig f�r f�ljande nyckel-id:n:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Jag kunde inte lokalisera n�gon fil f�r paketet %s. Detta kan betyda att du "
-"manuellt m�ste reparera detta paket (p� grund av saknad arkitektur)."
+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 "Jag kunde inte lokalisera n�gon fil f�r paketet %s. Detta kan betyda att du manuellt m�ste reparera detta paket (p� grund av saknad arkitektur)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
-msgstr ""
-"Jag kunde inte lokalisera n�gon fil f�r paketet %s. Detta kan betyda att du "
-"manuellt m�ste reparera detta paket."
+msgid "I wasn't able to locate file for the %s package. This might mean you need to manually fix this package."
+msgstr "Jag kunde inte lokalisera n�gon fil f�r paketet %s. Detta kan betyda att du manuellt m�ste reparera detta paket."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, 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 "Paketindexfilerna �r trasiga. Inget \"Filename:\"-f�lt f�r paketet %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Storleken st�mmer inte"
 
@@ -2610,7 +2664,8 @@ msgstr ""
 "Anv�nder cd-rom-monteringspunkt %s\n"
 "Monterar cd-rom\n"
 
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:516
+#: apt-pkg/cdrom.cc:598
 msgid "Identifying.. "
 msgstr "Identifierar.. "
 
@@ -2737,21 +2792,28 @@ msgstr "Tog bort %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
-msgid "Preparing for remove with config %s"
-msgstr "F�rbereder f�r borttagning med konfiguration %s"
+msgid "Preparing to completely remove %s"
+msgstr "F�rbereder att ta bort hela %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
-msgid "Removed with config %s"
-msgstr "Borttagen med konfiguration %s"
+msgid "Completely removed %s"
+msgstr "Tog bort hela %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "F�rbindelsen st�ngdes i f�rtid"
 
+#~ msgid "Reading file list"
+#~ msgstr "L�ser fillista"
+#~ msgid "Could not execute "
+#~ msgstr "Kunde inte exekvera "
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "F�rbereder f�r borttagning med konfiguration %s"
+#~ msgid "Removed with config %s"
+#~ msgstr "Borttagen med konfiguration %s"
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr "OkÃ¤nt leverantÃ¶rs-id \"%s\" pÃ¥ rad %u i kÃ¤llistan %s"
-
 #~ msgid ""
 #~ "Some broken packages were found while trying to process build-"
 #~ "dependencies.\n"
@@ -2760,8 +2822,8 @@ msgstr "F�rbindelsen st�ngdes i f�rtid"
 #~ "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."
 #~ msgstr ""
 #~ "Beklagar, men du har inte tillrÃ¤ckligt ledigt utrymme pÃ¥ %s fÃ¶r att "
 #~ "lagra alla .deb-filerna."
+
diff --git a/po/tl.po b/po/tl.po
index 3aa99c31b..d48db8bc5 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-11-03 03:35+0800\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-03-16 15:53+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
 "MIME-Version: 1.0\n"
@@ -150,14 +150,14 @@ msgstr "  Talaang Bersyon:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -310,7 +310,7 @@ msgstr ""
 #: 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?"
@@ -442,7 +442,7 @@ 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 maupgrade %s"
+msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
 
 #: ftparchive/cachedb.cc:73
 #, c-format
@@ -452,7 +452,7 @@ 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 talaksan %s"
+msgstr "Nagbago ang petsa ng talaksang %s"
 
 #: ftparchive/cachedb.cc:155
 msgid "Archive has no control record"
@@ -524,7 +524,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit na %sB tinamaan.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Bigo ang pag-stat ng %s"
@@ -541,7 +541,7 @@ msgstr "  %s ay walang override entry\n"
 #: 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"
+msgstr "  Tagapangalaga ng %s ay %s hindi %s\n"
 
 #: ftparchive/contents.cc:317
 #, c-format
@@ -638,79 +638,79 @@ msgstr "Problema sa pag-unlink ng %s"
 msgid "Failed to rename %s to %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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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 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 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 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 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 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 mga paketeng BAGO ay iluluklok:"
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:401
 msgid "The following packages will be REMOVED:"
 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 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 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
+#: 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!"
@@ -718,149 +718,150 @@ msgstr ""
 "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 luklok, "
+msgstr "%lu na nai-upgrade, %lu na bagong luklok, "
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:581
 #, c-format
 msgid "%lu reinstalled, "
 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 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 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 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 "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
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "Hindi maaldaba ang directory ng download"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "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 na karagdagang puwang sa disk ay magagamit.\n"
+msgstr ""
+"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
 
-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n"
+msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 
-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, c-format
 msgid "Couldn't determine free space in %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 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
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -871,28 +872,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "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 talaksang hindi nakuha"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 msgid "Download complete and in download only mode"
 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?"
@@ -900,48 +901,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"
+"Linaktawan ang %s, ito'y nakaluklok 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"
+msgstr "Hindi nakaluklok 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]"
+msgstr " [Nakaluklok]"
 
-#: 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."
+msgstr "Dapat kayong mamili ng isa na iluluklok."
 
-#: 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"
@@ -949,52 +950,52 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 "Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n"
-"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n"
+"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n"
 "sa ibang pinagmulan.\n"
 
-#: cmdline/apt-get.cc:1108
+#: cmdline/apt-get.cc: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"
+msgstr "Ang pagluklok 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:1311
+#: 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:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "Hindi maaldaba ang directory ng talaan"
 
-#: cmdline/apt-get.cc:1382
+#: cmdline/apt-get.cc:1384
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
@@ -1002,26 +1003,26 @@ msgstr ""
 "May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
 "mga luma na lamang."
 
-#: cmdline/apt-get.cc:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 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:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1029,7 +1030,7 @@ msgstr ""
 "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang "
 "mga pakete (o magtakda ng solusyon)."
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1040,125 +1041,130 @@ 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:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 "Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n"
-"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n"
+"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
 "pakete na ito."
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 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:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "Sirang mga pakete"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
-msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:"
+msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:"
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "Mga paketeng mungkahi:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "Mga paketeng rekomendado:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
-msgstr "Kinakalkula ang upgrade... "
+msgstr "Sinusuri ang pag-upgrade... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "Bigo"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "Tapos"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error na internal, may nasira ang problem resolver"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 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:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Hindi mahanap ang paketeng source para sa %s"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Linaktawan ang nakuha na na talaksan '%s'\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kulang kayo ng libreng puwang sa %s"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, 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:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Kailangang kumuha ng %sB ng arkibong source.\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Kunin ang Source %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "Bigo sa pagkuha ng ilang mga arkibo."
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, 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:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Bigo ang utos ng pagbuklat '%s'.\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Utos na build '%s' ay bigo.\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "Bigo ang prosesong anak"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 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:2123
+#: cmdline/apt-get.cc:2140
 #, 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:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1167,7 +1173,7 @@ msgstr ""
 "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
 "mahanap"
 
-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1176,32 +1182,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:2282
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %"
 "s ay bagong-bago pa lamang."
 
-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Hindi mabuo ang build-dependencies para sa %s."
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1305,7 +1311,7 @@ msgstr "Nakakuha ng %sB ng %s (%sB/s)\n"
 #: cmdline/acqprogress.cc:225
 #, c-format
 msgid " [Working]"
-msgstr " [May Ginagawa]"
+msgstr " [May ginagawa]"
 
 #: cmdline/acqprogress.cc:271
 #, c-format
@@ -1362,7 +1368,7 @@ msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang"
 
 #: dselect/install:101
 msgid "packages that were installed. This may result in duplicate errors"
-msgstr "mga paketeng na-instol. Maaaring dumulot ito ng mga error na doble"
+msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble"
 
 #: dselect/install:102
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1374,7 +1380,7 @@ msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 "sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin "
-"muli ang [I]nstol."
+"muli ang [I]luklok/Instol."
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1399,11 +1405,11 @@ 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"
@@ -1411,7 +1417,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"
@@ -1557,7 +1563,7 @@ msgstr "Bigo sa paglipat sa admin dir %sinfo"
 msgid "Internal error getting a package name"
 msgstr "Internal error sa pagkuha ng pangalan ng pakete"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "Binabasa ang Talaksang Listahan"
 
@@ -1604,10 +1610,6 @@ msgstr "Internal error sa pagdagdag ng diversion"
 msgid "The pkg cache must be initialized first"
 msgstr "Ang cache ng pkg ay dapat ma-initialize muna"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Binabasa ang Talaksang Listahan"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1681,12 +1683,12 @@ msgstr "Hindi nahanap ang Disk."
 msgid "File not found"
 msgstr "Hindi Nahanap ang Talaksan"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Bigo ang pag-stat"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Bigo ang pagtakda ng oras ng pagbago"
 
@@ -1814,7 +1816,7 @@ msgstr "Nag-timeout ang socket ng datos"
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
@@ -1835,9 +1837,9 @@ msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'"
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
-msgstr "Query"
+msgstr "Tanong"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "Hindi ma-invoke "
 
@@ -1866,73 +1868,74 @@ msgstr "Hindi maumpisahan ang koneksyon sa %s:%s (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Hindi maka-konek sa %s:%s (%s), nag-timeout ang koneksyon"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Hindi maka-konek sa %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "Kumokonek sa %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Hindi maresolba ang '%s'"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Hindi maka-konek sa %s %s:"
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Hindi maresolba ang '%s'"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. "
 "Lalabas."
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key "
 "fingerprint?!"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Hindi ma-execute ang "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr " upang maberipika ang lagda (nakaluklok ba ang gnupg?)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "Hindi kilalang error sa pag-execute ng gpgv"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "Ang sumusunod na mga lagda ay imbalido:\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1950,76 +1953,76 @@ 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:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
-msgstr "Naghihintay ng mga header"
+msgstr "Naghihintay ng panimula"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
-msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter"
+msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
-msgstr "Maling linyang header"
+msgstr "Maling linyang panimula"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na reply header"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Length header"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Nagpadala ang HTTP server ng di tanggap na Content-Range header"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Sira ang range support ng HTTP server na ito"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Di kilalang anyo ng petsa"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Bigo ang pagpili"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "Nag-timeout ang koneksyon"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
-msgstr "Maling datos sa header"
+msgstr "Maling datos sa panimula"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Internal na error"
 
@@ -2106,40 +2109,40 @@ msgstr "%c%s... Tapos"
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Option sa command line '%c' [mula %s] ay di kilala."
+msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala."
 
 #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
 #: apt-pkg/contrib/cmndline.cc:122
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "Option sa command line %s ay di naintindihan."
+msgstr "Opsyon sa command line %s ay di naintindihan."
 
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Option sa command line %s ay hindi boolean"
+msgstr "Opsyon sa command line %s ay hindi boolean"
 
 #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "Option %s ay nangangailangan ng argumento"
+msgstr "Opsyon %s ay nangangailangan ng argumento"
 
 #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
-"Option %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
+"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng "
 "=<halaga>."
 
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s ay nangangailangan ng argumentong integer, hindi '%s'"
+msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'"
 
 #: apt-pkg/contrib/cmndline.cc:268
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "Option '%s' ay labis ang haba"
+msgstr "Opsyon '%s' ay labis ang haba"
 
 #: apt-pkg/contrib/cmndline.cc:301
 #, c-format
@@ -2274,7 +2277,7 @@ msgstr "Rekomendado"
 
 #: apt-pkg/pkgcache.cc:219
 msgid "Conflicts"
-msgstr "Conflict"
+msgstr "Tunggali"
 
 #: apt-pkg/pkgcache.cc:219
 msgid "Replaces"
@@ -2316,12 +2319,12 @@ msgstr "Bersyong Kandidato"
 msgid "Dependency generation"
 msgstr "Pagbuo ng Dependensiya"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
@@ -2367,9 +2370,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Di kilalang uri '%s' sa linyang %u sa talaksang pagkukunan %s"
+msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, c-format
@@ -2424,11 +2427,18 @@ msgstr "Nawawala ang directory ng talaan %spartial."
 msgid "Archive directory %spartial is missing."
 msgstr "Nawawala ang directory ng arkibo %spartial."
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Kinukuha ang talaksang %li ng %li (%s ang natitira)"
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Binabasa ang Talaksang Listahan"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2573,11 +2583,15 @@ msgstr "IO Error sa pag-imbak ng source cache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "Di tugmang MD5Sum"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2586,7 +2600,7 @@ msgstr ""
 "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:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2595,7 +2609,7 @@ msgstr ""
 "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin "
 "niyong ayusin ng de kamay ang paketeng ito."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2603,7 +2617,7 @@ msgstr ""
 "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa "
 "paketeng %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
@@ -2751,19 +2765,31 @@ msgid "Removed %s"
 msgstr "Tinanggal ang %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Hinahanda ang %s upang isaayos"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "Tinanggal ang %s kasama ang pagkasaayos nito"
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Bigo sa pagtanggal ng %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Nagsara ng maaga ang koneksyon"
 
+#~ msgid "Reading file list"
+#~ msgstr "Binabasa ang Talaksang Listahan"
+
+#~ msgid "Could not execute "
+#~ msgstr "Hindi ma-execute ang "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Naghahanda upang tanggalin ang %s kasama ang pagkasaayos nito"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Tinanggal ang %s kasama ang pagkasaayos nito"
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 #~ "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..4578c8234
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,2809 @@
+# Vietnamese Translation for Apt.
+# This file is put in the public domain.
+# Clytie Siddall <clytie@riverland.net.au>, 2005, 2006.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: apt\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-01-22 13:04+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Generator: LocFactoryEditor 1.6b30\n"
+
+#: cmdline/apt-cache.cc:135
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Gói %s phiên bản %s phụ thuộc vào phần mềm chưa có :\n"
+
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Không thể định vị gói %s"
+
+#: cmdline/apt-cache.cc:232
+msgid "Total package names : "
+msgstr "Tổng tên gói: "
+
+#: cmdline/apt-cache.cc:272
+msgid "  Normal packages: "
+msgstr "  Gói bình thường: "
+
+#: cmdline/apt-cache.cc:273
+msgid "  Pure virtual packages: "
+msgstr "  Gói ảo nguyên chất: "
+
+#: cmdline/apt-cache.cc:274
+msgid "  Single virtual packages: "
+msgstr "  Gói ảo đơn: "
+
+#: cmdline/apt-cache.cc:275
+msgid "  Mixed virtual packages: "
+msgstr "  Gói ảo đã pha trộn: "
+
+#: cmdline/apt-cache.cc:276
+msgid "  Missing: "
+msgstr "  Thiếu: "
+
+#: cmdline/apt-cache.cc:278
+msgid "Total distinct versions: "
+msgstr "Tổng phiên bản riêng: "
+
+#: cmdline/apt-cache.cc:280
+msgid "Total dependencies: "
+msgstr "Tổng cách phụ thuộc: "
+
+#: cmdline/apt-cache.cc:283
+msgid "Total ver/file relations: "
+msgstr "Tổng cách liên quan phiên bản và tập tin: "
+
+#: cmdline/apt-cache.cc:285
+msgid "Total Provides mappings: "
+msgstr "Tổng cách ảnh xạ Miễn là: "
+
+#: cmdline/apt-cache.cc:297
+msgid "Total globbed strings: "
+msgstr "Tổng chuỗi mở rộng mẫu tìm kiếm: "
+
+#: cmdline/apt-cache.cc:311
+msgid "Total dependency version space: "
+msgstr "Tổng chỗ cho cách phụ thuộc vào phiên bản: "
+
+#: cmdline/apt-cache.cc:316
+msgid "Total slack space: "
+msgstr "Tổng chỗ chưa dùng: "
+
+#: cmdline/apt-cache.cc:324
+msgid "Total space accounted for: "
+msgstr "Tổng chỗ sẽ dùng: "
+
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "Tập tin gói %s không đồng bộ được."
+
+#: cmdline/apt-cache.cc:1231
+msgid "You must give exactly one pattern"
+msgstr "Bạn phải đưa ra đúng một mẫu"
+
+#: cmdline/apt-cache.cc:1385
+msgid "No packages found"
+msgstr "Không tìm thấy gói"
+
+#: cmdline/apt-cache.cc:1462
+msgid "Package files:"
+msgstr "Tập tin gói:"
+
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr ""
+"Bộ nhớ tạm không đồng bộ được nên không thể tham chiếu chéo tập tin gói"
+
+# Variable: do not translate/ biến: đừng dịch
+#: cmdline/apt-cache.cc:1470
+#, c-format
+msgid "%4i %s\n"
+msgstr "%4i %s\n"
+
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1482
+msgid "Pinned packages:"
+msgstr "Các gói đã ghim:"
+
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+msgid "(not found)"
+msgstr "(không tìm thấy)"
+
+#. Installed version
+#: cmdline/apt-cache.cc:1515
+msgid "  Installed: "
+msgstr "  Đã cài đặt: "
+
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+msgid "(none)"
+msgstr "(không có)"
+
+#. Candidate Version
+#: cmdline/apt-cache.cc:1522
+msgid "  Candidate: "
+msgstr "  Ứng cử: "
+
+#: cmdline/apt-cache.cc:1532
+msgid "  Package pin: "
+msgstr "  Ghim gói: "
+
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1541
+msgid "  Version table:"
+msgstr "  Bảng phiên bản:"
+
+# Variable: do not translate/ biến: đừng dịch
+#: cmdline/apt-cache.cc:1556
+#, c-format
+msgid "       %4i %s\n"
+msgstr "       %4i %s\n"
+
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
+#, c-format
+msgid "%s %s for %s %s compiled on %s %s\n"
+msgstr "%s %s cho %s %s được biên dịch vào %s %s\n"
+
+#: cmdline/apt-cache.cc:1659
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
+"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+"   add - Add a package file to the source cache\n"
+"   gencaches - Build both the package and source cache\n"
+"   showpkg - Show some general information for a single package\n"
+"   showsrc - Show source records\n"
+"   stats - Show some basic statistics\n"
+"   dump - Show the entire file in a terse form\n"
+"   dumpavail - Print an available file to stdout\n"
+"   unmet - Show unmet dependencies\n"
+"   search - Search the package list for a regex pattern\n"
+"   show - Show a readable record for the package\n"
+"   depends - Show raw dependency information for a package\n"
+"   rdepends - Show reverse dependency information for a package\n"
+"   pkgnames - List the names of all packages\n"
+"   dotty - Generate package graphs for GraphVis\n"
+"   xvcg - Generate package graphs for xvcg\n"
+"   policy - Show policy settings\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -p=? The package cache.\n"
+"  -s=? The source cache.\n"
+"  -q   Disable progress indicator.\n"
+"  -i   Show only important deps for the unmet command.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Cách sử dụng: apt-cache [tùy_chọn...] lệnh\n"
+"       apt-cache [tùy_chọn...] add tập_tin1 [tập_tin2 ...]\n"
+"       apt-cache [tùy_chọn...] showpkg gói1 [gói2 ...]\n"
+"       apt-cache [tùy_chọn...] showsrc gói1 [gói2 ...]\n"
+"(cache: \tbộ nhớ tạm;\n"
+"add: \tthêm;\n"
+"showpkg: hiển thị gói;\n"
+"showsrc: \thiển thị nguồn)\n"
+"\n"
+"apt-cache là một công cụ mức thấp dùng để thao tác\n"
+"những tập tin bộ nhớ tạm nhị phân của APT,\n"
+"và cũng để truy vấn thông tin từ những tập tin đó.\n"
+"\n"
+"Lệnh:\n"
+"   add\t\t_Thêm_ gói vào bộ nhớ tạm nguồn\n"
+"   gencaches\tXây dung (_tạo ra_) cả gói lẫn _bộ nhớ tạm_ nguồn đều\n"
+"   showpkg\t_Hiện_ một phần thông tin chung về một _gói_ riêng lẻ\n"
+"   showsrc\t_Hiện_ các mục ghi _nguồn_\n"
+"   stats\t\tHiện một phần _thống kê_ cơ bản\n"
+"   dump\t\tHiện toàn bộ tập tin dạng ngắn (_đổ_)\n"
+"   dumpavail\tIn ra một tập tin _sẵn sàng_ vào thiết bị xuất chuẩn (_đổ_)\n"
+"   unmet\t\tHiện các cách phụ thuộc _chưa thực hiện_\n"
+"   search\t\t_Tìm kiếm_ mẫu biểu thức chính quy trong danh sách gói\n"
+"   show\t\t_Hiệnị_ mục ghi có thể đọc, cho những gói đó\n"
+"   depends\tHiện thông tin cách _phụ thuộc_ thô cho gói\n"
+"   rdepends\tHiện thông tin cách _phụ thuộc ngược lại_, cho gói\n"
+"   pkgnames\tHiện danh sách _tên_ mọi _gói_\n"
+"   dotty\t\tTạo ra đồ thị gói cho GraphVis (_nhiều chấm_)\n"
+"   xvcg\t\tTạo ra đồ thị gói cho _xvcg_\n"
+"   policy\t\tHiển thị các thiết lập _chính thức_\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   \t\t_Trợ giúp_ này\n"
+"  -p=? \t\tBộ nhớ tạm _gói_.\n"
+"  -s=? \t\tBộ nhớ tạm _nguồn_.\n"
+"  -q   \t\tTắt cái chỉ tiến trình (_im_).\n"
+"  -i   \t\tHiện chỉ những cách phụ thuộc _quan trọng_\n"
+"\t\t\tcho lệnh chưa thực hiện.\n"
+"  -c=? \t\tĐọc tập tin _cấu hình_ này\n"
+"  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+"Để tìm thông tin thêm thì bạn hãy xem hai trang « man » (hướng dẫn)\n"
+"\t\t\tapt-cache(8) và apt.conf(5).\n"
+
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr "Hãy cung cấp tên cho Đĩa này, như « Debian 2.1r1 Đĩa 1 »"
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr "Hãy lặp lại tiến trình này cho các Đĩa còn lại trong bộ đĩa của bạn."
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Không có các đối số dạng cặp"
+
+#: cmdline/apt-config.cc:76
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+"   shell - Shell mode\n"
+"   dump - Show the configuration\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách sử dụng: apt-config [tùy_chọn...] lệnh\n"
+"\n"
+"[config: viết tắt cho từ configuration: cấu hình]\n"
+"\n"
+"apt-config là một công cụ đơn giản để đọc tập tin cấu hình APT.\n"
+"\n"
+"Lệnh:\n"
+"   shell\t\tChế độ _hệ vỏ_\n"
+"   dump\t\tHiển thị cấu hình (_đổ_)\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   \t\t_Trợ giúp_ này\n"
+"  -c=? \t\tĐọc tập tin cấu hình này\n"
+"  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+
+#: cmdline/apt-extracttemplates.cc:98
+#, c-format
+msgid "%s not a valid DEB package."
+msgstr "%s không phải là một gói DEB hợp lệ."
+
+#: cmdline/apt-extracttemplates.cc:232
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách sử dụng: apt-extracttemplates tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[extract: \t\trút;\n"
+"templates: \tnhững biểu mẫu]\n"
+"\n"
+"apt-extracttemplates là một công cụ rút thông tin kiểu cấu hình\n"
+"\tvà biểu mẫu đều từ gói Debian\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   \t\t_Trợ giúp_ này\n"
+"  -t   \t\tLập thư muc tạm thời\n"
+"\t\t[temp, tmp: viết tắt cho từ « temporary »: tạm thời]\n"
+"  -c=? \t\tĐọc tập tin cấu hình này\n"
+"  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc: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ể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
+
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+msgid "Package extension list is too long"
+msgstr "Danh sách mở rộng gói quá dài"
+
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#, c-format
+msgid "Error processing directory %s"
+msgstr "Gặp lỗi khi xử lý thư mục %s"
+
+#: ftparchive/apt-ftparchive.cc:254
+msgid "Source extension list is too long"
+msgstr "Danh sách mở rộng nguồn quá dài"
+
+#: ftparchive/apt-ftparchive.cc:371
+msgid "Error writing header to contents file"
+msgstr "Gặp lỗi khi ghi phần đầu vào tập tin nộị dung"
+
+#: ftparchive/apt-ftparchive.cc:401
+#, c-format
+msgid "Error processing contents %s"
+msgstr "Gặp lỗi khi xử lý nội dung %s"
+
+#: ftparchive/apt-ftparchive.cc:556
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Cách sử dụng: apt-ftparchive [tùy_chọn...] lệnh\n"
+"\n"
+"[ftparchive: FTP archive: kho FTP]\n"
+"\n"
+"Lệnh: \tpackages binarypath [tập_tin_đè [tiền_tố_đường_dẫn]]\n"
+"          \tsources srcpath [tập_tin_đè[tiền_tố_đường_dẫn]]\n"
+"          \tcontents path\n"
+"         \trelease path\n"
+"          \tgenerate config [groups]\n"
+"          \tclean config\n"
+"\n"
+"[packages: \tnhững gói;\n"
+"binarypath: \tđường dẫn nhị phân;\n"
+"sources: \t\tnhững nguồn;\n"
+"srcpath: \t\tđường dẫn nguồn;\n"
+"contents path: đường dẫn nội dụng;\n"
+"release path: \tđường dẫn bản đã phát hành;\n"
+"generate config [groups]: tạo ra cấu hình [nhóm];\n"
+"clean config: \tcấu hình toàn mới)\n"
+"\n"
+"apt-ftparchive (kho ftp) thì tạo ra tập tin chỉ mục cho kho Debian.\n"
+"Nó hỗ trợ nhiều cách tạo ra, từ cách tự động toàn bộ\n"
+"đến cách thay thế điều hoặt động cho dpkg-scanpackages (dpkg-quét_gói)\n"
+"và dpkg-scansources (dpkg-quét_nguồn).\n"
+"\n"
+"apt-ftparchive tạo ra tập tin Gói ra cây các .deb.\n"
+"Tập tin gói chứa nội dung các trường điều khiển từ mỗi gói,\n"
+"cùng với băm MD5 và kích cỡ tập tin.\n"
+"Hỗ trợ tập tin đè để buộc giá trị Ưu tiên và Phần\n"
+"\n"
+"Tương tự, apt-ftparchive tạo ra tập tin Nguồn ra cây các .dsc\n"
+"Có thể sử dụng tùy chọn « --source-override » (đè nguồn)\n"
+"để ghi rõ tập tin đè nguồn\n"
+"\n"
+"Lnh « packages » (gói) và « sources » (nguồn) nên chạy tại gốc cây.\n"
+"BinaryPath (đường dẫn nhị phân) nên chỉ tới cơ bản của việc tìm kiếm đệ "
+"quy,\n"
+"và tập tin đè nên chứa những cờ đè.\n"
+"Pathprefix (tiền tố đường dẫn) được phụ thêm vào\n"
+"những trường tên tập tin nếu có.\n"
+"Cách sử dụng thí dụ từ kho Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   \t\t_Trợ giúp_ này\n"
+"  --md5 \t\tĐiều khiển cách tạo ra MD5\n"
+"  -s=?  \t\tTập tin đè nguồn\n"
+"  -q    \t\t_Im_ (không xuất chi tiết)\n"
+"  -d=?  \t\tChọn _cơ sở dữ liệu_ nhớ tạm tùy chọn\n"
+"  --no-delink \tMở chế độ gỡ lỗi _bỏ liên kết_\n"
+"  --contents  \tĐiều khiển cách tạo ra tập tin _nội dung_\n"
+"  -c=? \t\tĐọc tập tin cấu hình này\n"
+"  -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »"
+
+#: ftparchive/apt-ftparchive.cc:762
+msgid "No selections matched"
+msgstr "Không có điều đã chọn khớp được"
+
+#: ftparchive/apt-ftparchive.cc:835
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »."
+
+#: ftparchive/cachedb.cc: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 %s"
+
+#: ftparchive/cachedb.cc:155
+msgid "Archive has no control record"
+msgstr "Kho không có mục ghi điều khiển"
+
+#: ftparchive/cachedb.cc:267
+msgid "Unable to get a cursor"
+msgstr "Không thể lấy con chạy"
+
+#: 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ể lấy 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 "Việc quyết định %s bị lỗi"
+
+#: ftparchive/writer.cc:163
+msgid "Tree walking failed"
+msgstr "Việc di chuyển qua cây bị lỗi"
+
+#: ftparchive/writer.cc:188
+#, c-format
+msgid "Failed to open %s"
+msgstr "Việc mở %s bị lỗi"
+
+#: 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 "Việc tạo liên kết lại %s bị lỗi"
+
+#: ftparchive/writer.cc:257
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Việc bỏ liên kết %s bị lỗi"
+
+#: ftparchive/writer.cc:264
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Việc liên kết %s đến %s bị lỗi"
+
+#: ftparchive/writer.cc: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:266
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi"
+
+#: ftparchive/writer.cc:386
+msgid "Archive had no package field"
+msgstr "Kho không có trường gói"
+
+#: 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"
+
+#: 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
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#, c-format
+msgid "Unable to open %s"
+msgstr "Không thể mở %s"
+
+#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#, c-format
+msgid "Malformed override %s line %lu #1"
+msgstr "Điều đè dạng sai %s dòng %lu #1"
+
+#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#, c-format
+msgid "Malformed override %s line %lu #2"
+msgstr "Điều đè dạng sai %s dòng %lu #2"
+
+#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#, c-format
+msgid "Malformed override %s line %lu #3"
+msgstr "Điều đè dạng sai %s dòng %lu #3"
+
+#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Việc đọc tập tin đè %s bị lỗi"
+
+#: ftparchive/multicompress.cc:75
+#, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Không biết thuật toán nén « %s »"
+
+#: ftparchive/multicompress.cc:105
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
+
+#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
+
+#: ftparchive/multicompress.cc:198
+msgid "Failed to create FILE*"
+msgstr "Việc tạo TẬP_TIN* bị lỗi"
+
+#: ftparchive/multicompress.cc:201
+msgid "Failed to fork"
+msgstr "Việc tạo tiến trình con bị lỗi"
+
+#: ftparchive/multicompress.cc:215
+msgid "Compress child"
+msgstr "Nén điều con"
+
+#: ftparchive/multicompress.cc:238
+#, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Lỗi nội bộ, việc tạo %s bị lỗi"
+
+#: ftparchive/multicompress.cc:289
+msgid "Failed to create subprocess IPC"
+msgstr "Việc tạo tiến trình con IPC bị lỗi"
+
+#: ftparchive/multicompress.cc:324
+msgid "Failed to exec compressor "
+msgstr "Việc thực hiện bô nén bị lỗi "
+
+#: ftparchive/multicompress.cc:363
+msgid "decompressor"
+msgstr "bộ giải nén"
+
+#: ftparchive/multicompress.cc:406
+msgid "IO to subprocess/file failed"
+msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi"
+
+#: ftparchive/multicompress.cc:458
+msgid "Failed to read while computing MD5"
+msgstr "Việc đọc khi tính MD5 bị lỗi"
+
+#: ftparchive/multicompress.cc:475
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gặp lỗi khi bỏ liên kết %s"
+
+#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Việc đổi tên %s thành %s bị lỗi"
+
+#: cmdline/apt-get.cc:120
+msgid "Y"
+msgstr "C"
+
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#, 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à %s đã được cài đặt"
+
+#: cmdline/apt-get.cc:329
+#, c-format
+msgid "but %s is to be installed"
+msgstr "nhưng mà %s sẽ được cài đặt"
+
+#: cmdline/apt-get.cc:336
+msgid "but it is not installable"
+msgstr "nhưng mà nó không có khả năng cài đặt"
+
+#: 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à nó chưa được cài đặt"
+
+#: cmdline/apt-get.cc:341
+msgid "but it is not going to be installed"
+msgstr "nhưng mà nó sẽ không được cài đặt"
+
+#: cmdline/apt-get.cc: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 đặt:"
+
+#: cmdline/apt-get.cc:401
+msgid "The following packages will be REMOVED:"
+msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
+
+#: cmdline/apt-get.cc:423
+msgid "The following packages have been kept back:"
+msgstr "Theo đây có những gói đã được 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ẽ được 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
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"CẢNH BÁO : theo đây có những gói chủ yếu sẽ bị gỡ bỏ.\n"
+"ĐỪNG làm như thế trừ khi bạn biết làm gì ở đây nó một cách chính xác."
+
+#: cmdline/apt-get.cc:577
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu đã nâng cấp, %lu mới được cài đặt, "
+
+#: cmdline/apt-get.cc:581
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu được cài đặt lại, "
+
+#: cmdline/apt-get.cc:583
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu được hạ cấp, "
+
+#: cmdline/apt-get.cc:585
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
+
+#: cmdline/apt-get.cc:589
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
+
+#: cmdline/apt-get.cc:649
+msgid "Correcting dependencies..."
+msgstr "Đang 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"
+
+#: 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 hết."
+
+#: cmdline/apt-get.cc:667
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+"Còn có cách phụ thuộc vào phần mềm chưa có. Như thế thì bạn hãy cố dùng tùy "
+"chọn « -f »."
+
+#: cmdline/apt-get.cc:689
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
+
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
+msgstr "Cảnh báo xác thực bị đè.\n"
+
+#: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr "Cài đặt những gói này mà không kiểm chứng không? [y/N] [c/K] "
+
+#: cmdline/apt-get.cc:702
+msgid "Some packages could not be authenticated"
+msgstr "Một số gói không thể được xác thực"
+
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có  « --force-yes »"
+
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Lỗi nội bộ: InstallPackages (cài đặt gói) được gọi với gói bị hỏng."
+
+#: cmdline/apt-get.cc:764
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ (Remove) đã bị tắt."
+
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
+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:1881 cmdline/apt-get.cc:2117
+#: 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 ""
+"Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
+
+#: cmdline/apt-get.cc:821
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Cần phải lấy %sB/%sB kho.\n"
+
+#: cmdline/apt-get.cc:824
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Cần phải lấy %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, sẻ chiếm %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, sẽ giải phóng %sB sức chữa đĩa thêm.\n"
+
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Không thể quyết định chỗ rảnh trong %s"
+
+#: cmdline/apt-get.cc: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
+#, 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
+msgid "Do you want to continue [Y/n]? "
+msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] "
+
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Việc gói %s bị lỗi  %s\n"
+
+#: cmdline/apt-get.cc:979
+msgid "Some files failed to download"
+msgstr "Một số tập tin không tải về được"
+
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
+msgid "Download complete and in download only mode"
+msgstr "Mới tải về xong và trong chế độ chỉ tải về"
+
+#: cmdline/apt-get.cc:986
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Không thể lấy một số kho, có lẽ hãy chạy lệnh « apt-get update » (apt lấy "
+"cập nhật) hay cố với « --fix-missing » (sửa các điều còn thiếu) không?"
+
+#: cmdline/apt-get.cc: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 những gói còn thiếu."
+
+#: cmdline/apt-get.cc:996
+msgid "Aborting install."
+msgstr "Đang hủy bỏ cài đặt."
+
+#: 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 "Đang bỏ qua %s vì nó đã được cài đặt và chưa lập tùy chọn Nâng cấp.\n"
+
+#: cmdline/apt-get.cc:1058
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
+
+#: cmdline/apt-get.cc: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 đặt]"
+
+#: 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 sẵn sàng, nhưng mà một gói khác\n"
+"đã tham chiếu đến nó. Có lẽ có nghĩa là gói còn thiếu,\n"
+"đã trở thành cũ, hay chỉ sẵn sàng từ nguồn khác.\n"
+
+#: cmdline/apt-get.cc:1110
+msgid "However the following packages replace it:"
+msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
+
+#: 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 đặt"
+
+#: 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 đặt lại %s vì không thể tải về nó.\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.\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
+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 ""
+"Một số tập tin chỉ mục không tải về được, đã bỏ qua chúng, hoặc điều cũ được "
+"dùng thay thế."
+
+#: cmdline/apt-get.cc:1403
+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:1493 cmdline/apt-get.cc:1529
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Không tìm thấy gói %s"
+
+#: cmdline/apt-get.cc:1516
+#, 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:1546
+msgid "You might want to run `apt-get -f install' to correct these:"
+msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
+
+#: cmdline/apt-get.cc:1549
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f "
+"install » mà không có gói nào (hoặc ghi rõ cách quyết định)."
+
+#: cmdline/apt-get.cc:1561
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Không thể cài đặt một số gói. Có lẽ có nghĩa là bạn đa yêu cầu\n"
+"một trường hợp không thể, hoặc nếu bạn sử dụng bản phân phối\n"
+"bất định, có lẽ chưa tạo một số gói cần thiết,\n"
+"hoặc chưa di chuyển chúng ra phần Incoming (Đến)."
+
+#: cmdline/apt-get.cc:1569
+msgid ""
+"Since you only requested a single operation it is extremely likely that\n"
+"the package is simply not installable and a bug report against\n"
+"that package should be filed."
+msgstr ""
+"Vì bạn đã yêu cầu chỉ một thao tác riêng lẻ, rât có thể là\n"
+"gói này đơn giản không có khả năng cài đặt, thì bạn hay\n"
+"thông báo lỗi về gói này."
+
+#: cmdline/apt-get.cc:1574
+msgid "The following information may help to resolve the situation:"
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
+
+#: cmdline/apt-get.cc:1577
+msgid "Broken packages"
+msgstr "Gói bị ngắt"
+
+#: cmdline/apt-get.cc:1603
+msgid "The following extra packages will be installed:"
+msgstr "Những gói thêm theo đây sẽ được cài đặt:"
+
+#: cmdline/apt-get.cc:1674
+msgid "Suggested packages:"
+msgstr "Gói được đệ nghị:"
+
+#: cmdline/apt-get.cc:1675
+msgid "Recommended packages:"
+msgstr "Gói được khuyên:"
+
+#: cmdline/apt-get.cc:1695
+msgid "Calculating upgrade... "
+msgstr "Đang tính nâng cấp... "
+
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
+msgid "Failed"
+msgstr "Bị lỗi"
+
+#: cmdline/apt-get.cc:1703
+msgid "Done"
+msgstr "Xong"
+
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì"
+
+#: cmdline/apt-get.cc:1876
+msgid "Must specify at least one package to fetch source for"
+msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó"
+
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Không tìm thấy gói nguồn cho %s"
+
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
+
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "You don't have enough free space in %s"
+msgstr "Không đủ sức chứa còn rảnh trong %s"
+
+#: cmdline/apt-get.cc:1979
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
+
+#: cmdline/apt-get.cc:1982
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Cần phải lấy %sB kho nguồn.\n"
+
+#: cmdline/apt-get.cc:1988
+#, c-format
+msgid "Fetch source %s\n"
+msgstr "Lấy nguồn %s\n"
+
+#: cmdline/apt-get.cc:2019
+msgid "Failed to fetch some archives."
+msgstr "Việc lấy một số kho bị lỗi."
+
+#: cmdline/apt-get.cc:2047
+#, 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:2059
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Lệnh giải nén « %s » bị lỗi.\n"
+
+#: cmdline/apt-get.cc:2060
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
+
+#: cmdline/apt-get.cc:2077
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
+
+#: cmdline/apt-get.cc:2096
+msgid "Child process failed"
+msgstr "Tiến trình con bị lỗi"
+
+#: cmdline/apt-get.cc:2112
+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:2140
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s"
+
+#: cmdline/apt-get.cc:2160
+#, 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:2212
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s"
+
+#: cmdline/apt-get.cc:2264
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"
+msgstr ""
+"cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng "
+"của gói %s có thể thỏa điều kiện phiên bản."
+
+#: cmdline/apt-get.cc:2299
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới"
+
+#: cmdline/apt-get.cc:2324
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
+
+#: cmdline/apt-get.cc:2338
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
+
+#: cmdline/apt-get.cc:2342
+msgid "Failed to process build dependencies"
+msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
+
+#: cmdline/apt-get.cc:2374
+msgid "Supported modules:"
+msgstr "Mô-đun đã hỗ trợ :"
+
+#: cmdline/apt-get.cc:2415
+msgid ""
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+"   update - Retrieve new lists of packages\n"
+"   upgrade - Perform an upgrade\n"
+"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+"   remove - Remove packages\n"
+"   source - Download source archives\n"
+"   build-dep - Configure build-dependencies for source packages\n"
+"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+"   dselect-upgrade - Follow dselect selections\n"
+"   clean - Erase downloaded archive files\n"
+"   autoclean - Erase old downloaded archive files\n"
+"   check - Verify that there are no broken dependencies\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -d  Download only - do NOT install or unpack archives\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Attempt to continue if the integrity check fails\n"
+"  -m  Attempt to continue if archives are unlocatable\n"
+"  -u  Show a list of upgraded packages as well\n"
+"  -b  Build the source package after fetching it\n"
+"  -V  Show verbose version numbers\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+"Cách sử dụng: apt-get [tùy_chọn...] lệnh\n"
+"       apt-get [tùy_chọn...] install|remove gói1 [gói2 ...]\n"
+"       apt-get [tùy_chọn...] source gói1 [gói2 ...]\n"
+"\n"
+"[get: \tlấy\n"
+"install: \tcài đặt\n"
+"remove: \tgỡ bỏ\n"
+"source: \tnguồn]\n"
+"\n"
+"apt-get là một giao diện dòng lệnh đơn giản để tải về và cài đặt gói.\n"
+"Những lệnh đã dùng thường nhất là update (cập nhật) và install (cài đặt).\n"
+"\n"
+"Lệnh:\n"
+"   update\t\tLấy danh sách gói mới (_cập nhật_)\n"
+"   upgrade \t_Nâng cập_ \n"
+"   install \t\t_Cài đặt_ gói mới (gói là libc6 không phải libc6.deb)\n"
+"   remove \t_Gỡ bỏ_ gói\n"
+"   source \t\tTải về kho _nguồn_\n"
+"   build-dep \tĐịnh cấu hình _cách phụ thuộc khi xây dụng_, cho gói nguồn\n"
+"   dist-upgrade \t_Nâng cấp bản phân phối_,\n"
+"\t\t\t\t\thãy xem trang hướng dẫn (man) apt-get(8)\n"
+"   dselect-upgrade \t\tTheo cách chọn dselect (_nâng cấp_)\n"
+"   clean \t\tXóa bỏ các tập tin kho đã tải về (_làm sạch_)\n"
+"   autoclean \tXóa bỏ các tập tin kho cũ đã tải về (_tự động làm sạch_)\n"
+"   check \t\t_Kiểm chứng_ không có cách phụ thuộc bị ngắt\n"
+"\n"
+"Tùy chọn:\n"
+"  -h  \t_Trợ giúp_ này.\n"
+"  -q  \tDữ liệu xuất có thể ghi lưu - không có cái chỉ tiến trình (_im_)\n"
+"  -qq \tKhông xuất thông tin nào, trừ lỗi (_im im_)\n"
+"  -d  \tChỉ _tải về_, ĐỪNG cài đặt hay giải nén kho\n"
+"  -s  \tKhông hoạt đông. _Mô phỏng_ sắp xếp\n"
+"  -y  \tGiả sử trả lời _Có_ (yes) mọi khi gặp câu hỏi;\n"
+"\t\t\t\t\tđừng nhắc người dùng gõ gì\n"
+"  -f  \t\tCố tiếp tục lại nếu việc kiểm tra tính nguyên vẹn _thất bại_\n"
+"  -m  \tCố tiếp tục lại nếu không thể định vị kho\n"
+"  -u  \tCũng hiện danh sách các gói đã _nâng cấp_\n"
+"  -b  \t_Xây dụng_ gói nguồn sau khi lấy nó\n"
+"  -V  \tHiện số thứ tự _phiên bản chi tiết_\n"
+"  -c=? \tĐọc tập tin cấu hình ấy\n"
+"  -o=? \tLập tùy chọn nhiệm ý, v.d. -o dir::cache=/tmp\n"
+"Để tim thông tin và tùy chọn thêm thì hãy xem trang hướng dẫn apt-get(8), "
+"sources.list(5) và apt.conf(5).\n"
+"                       Trình APT này có năng lực của bò siêu.\n"
+
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Lần tìm "
+
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Lấy:"
+
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Bỏq "
+
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Lỗi "
+
+#: cmdline/acqprogress.cc:135
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Mới lấy %sB trong %s (%sB/g).\n"
+
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Hoạt động]"
+
+#: cmdline/acqprogress.cc:271
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Chuyển đổi vật chứa: hãy nạp đĩa có nhãn\n"
+" « %s »\n"
+"vào ổ « %s » và bấm nút Enter\n"
+
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Không biết mục ghi gói."
+
+#: cmdline/apt-sortpkgs.cc:150
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Cách sử dụng: apt-sortpkgs [tùy_chọn...] tập_tin1 [tập_tin2 ...]\n"
+"\n"
+"[sortpkgs: sort packages: sắp xếp các gói]\n"
+"\n"
+"apt-sortpkgs là một công cụ đơn giản để sắp xếp tập tin gói.\n"
+"Tùy chon « -s » dùng để ngụ ý kiểu tập tin.\n"
+"\n"
+"Tùy chọn:\n"
+"  -h   \t_Trợ giúp_ này\n"
+"  -s   \tSắp xếp những tập tin _nguồn_\n"
+"  -c=? \tĐọc tập tin cấu hình này\n"
+"  -o=? \tLập tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n"
+
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Thiết lập mặc định sai."
+
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
+#: dselect/install:104 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Hãy bấm phím Enter để tiếp tục lại."
+
+#: dselect/install:100
+msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgstr "Gập một số lỗi khi giải nén. Sẽ cấu hình"
+
+#: dselect/install:101
+msgid "packages that were installed. This may result in duplicate errors"
+msgstr "những gói đã đươc cài đặt. Có lẽ sẽ gây ra lỗi trùng"
+
+#: dselect/install:102
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+"hoặc lỗi khi không có phần mềm mà gói khác phụ thuộc vào nó. Không có sao, "
+"chỉ những lỗi"
+
+#: dselect/install:103
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"
+msgstr ""
+"ở trên thông điệp này là quan trọng. Hãy sửa chúng và chạy lại [I]nstall "
+"(cài đặt)"
+
+#: dselect/update:30
+msgid "Merging available information"
+msgstr "Đang hợp nhất các thông tin sẵn sàng..."
+
+#: apt-inst/contrib/extracttar.cc:117
+msgid "Failed to create pipes"
+msgstr "Việc tạo những ống bị lỗi"
+
+#: apt-inst/contrib/extracttar.cc:143
+msgid "Failed to exec gzip "
+msgstr "Việc thực hiện gzip bị lỗi "
+
+#: 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
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tiến trình tar  (kiểm tổng tar) thât bại: kho bị hỏng."
+
+#: apt-inst/contrib/extracttar.cc:298
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Không biết kiểu phần đầu tar %u, bộ phạn %s"
+
+#: apt-inst/contrib/arfile.cc:73
+msgid "Invalid archive signature"
+msgstr "Chữ ký kho không hợp lệ"
+
+#: apt-inst/contrib/arfile.cc:81
+msgid "Error reading archive member header"
+msgstr "Gặp lỗi khi đọc phần đầu bộ phạn kho"
+
+#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+msgid "Invalid archive member header"
+msgstr "Phần đầu bộ phạn kho không hợp lê"
+
+#: apt-inst/contrib/arfile.cc:131
+msgid "Archive is too short"
+msgstr "Kho quá ngắn"
+
+#: apt-inst/contrib/arfile.cc:135
+msgid "Failed to read the archive headers"
+msgstr "Việc đọc phần đầu kho bị lỗi"
+
+#: apt-inst/filelist.cc:384
+msgid "DropNode called on still linked node"
+msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn liên kết"
+
+#: apt-inst/filelist.cc:416
+msgid "Failed to locate the hash element!"
+msgstr "Việc định vi phần tử băm bị lỗi"
+
+#: apt-inst/filelist.cc:463
+msgid "Failed to allocate diversion"
+msgstr "Việc cấp phát sự trệch đi bị lỗi"
+
+#: apt-inst/filelist.cc:468
+msgid "Internal error in AddDiversion"
+msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
+
+#: apt-inst/filelist.cc:481
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
+
+#: apt-inst/filelist.cc:510
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Sự trệch đi được thêm hai lần %s → %s"
+
+#: apt-inst/filelist.cc:553
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Tập tin cấu hình trùng %s/%s"
+
+#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#, c-format
+msgid "Failed to write file %s"
+msgstr "Việc ghi tập tin %s bị lỗi"
+
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Việc đóng tập tin %s bị lỗi"
+
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#, c-format
+msgid "The path %s is too long"
+msgstr "Đường dẫn %s quá dài"
+
+#: apt-inst/extract.cc:127
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Đang giải nén %s nhiều lần"
+
+#: apt-inst/extract.cc:137
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Thư mục %s bị trệch hướng"
+
+#: apt-inst/extract.cc:147
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Gói này đang cố ghi vào đích trệch đi %s/%s"
+
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+msgid "The diversion path is too long"
+msgstr "Đường dẫn trệch đi quá dài."
+
+#: apt-inst/extract.cc:243
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Thư mục %s đang được thay thế do điều không phải là thư mục"
+
+#: apt-inst/extract.cc:283
+msgid "Failed to locate node in its hash bucket"
+msgstr "Việc định vị điểm nút trong hộp băm nó bị lỗi"
+
+#: apt-inst/extract.cc:287
+msgid "The path is too long"
+msgstr "Đường dẫn quá dài"
+
+#: apt-inst/extract.cc:417
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Ghi đè lên gói đã khớp mà không có phiên bản cho %s"
+
+#: apt-inst/extract.cc:434
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s"
+
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#, c-format
+msgid "Unable to read %s"
+msgstr "Không thể đọc %s"
+
+#: apt-inst/extract.cc:494
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Không thể lấy các thông tin về %s"
+
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#, c-format
+msgid "Failed to remove %s"
+msgstr "Việc gỡ bỏ %s bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#, c-format
+msgid "Unable to create %s"
+msgstr "Không thể tạo %s"
+
+#: apt-inst/deb/dpkgdb.cc:118
+#, c-format
+msgid "Failed to stat %sinfo"
+msgstr "Việc lấy các thông tin về %sinfo bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:123
+msgid "The info and temp directories need to be on the same filesystem"
+msgstr ""
+"Những thư mục info (thông tin) và temp (tạm thời) cần phải trong cùng một hệ "
+"thống tập tin"
+
+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840
+msgid "Reading package lists"
+msgstr "Đang đọc các danh sách gói..."
+
+#: apt-inst/deb/dpkgdb.cc:180
+#, c-format
+msgid "Failed to change to the admin dir %sinfo"
+msgstr "Việc chuyển đổi sang thư mục quản lý %sinfo bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448
+msgid "Internal error getting a package name"
+msgstr "Gặp lỗi nội bộ khi lấy tên gói"
+
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+msgid "Reading file listing"
+msgstr "Đang đọc danh sách tập tin..."
+
+#: apt-inst/deb/dpkgdb.cc:216
+#, c-format
+msgid ""
+"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+"then make it empty and immediately re-install the same version of the "
+"package!"
+msgstr ""
+"Việc mở tập tin danh sách « %sinfo/%s » bị lỗi. Nếu bạn không thể phục hồi "
+"tập tin này, bạn hãy làm cho nó rỗng và ngay cài đặt lại cùng phiên bản gói."
+
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#, c-format
+msgid "Failed reading the list file %sinfo/%s"
+msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:266
+msgid "Internal error getting a node"
+msgstr "Gặp lỗi nội bộ khi lấy nút điểm..."
+
+#: apt-inst/deb/dpkgdb.cc:309
+#, c-format
+msgid "Failed to open the diversions file %sdiversions"
+msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi"
+
+#: apt-inst/deb/dpkgdb.cc:324
+msgid "The diversion file is corrupted"
+msgstr "Tập tin trệch đi bị hỏng"
+
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341
+#, c-format
+msgid "Invalid line in the diversion file: %s"
+msgstr "Gặp dòng không hợp lệ trong tập tin trệch đi: %s"
+
+#: apt-inst/deb/dpkgdb.cc:362
+msgid "Internal error adding a diversion"
+msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi"
+
+#: apt-inst/deb/dpkgdb.cc:383
+msgid "The pkg cache must be initialized first"
+msgstr "Phải khởi động bộ nhớ tạm gói trước hết"
+
+#: apt-inst/deb/dpkgdb.cc:443
+#, c-format
+msgid "Failed to find a Package: header, offset %lu"
+msgstr "Lỗi tìm thấy Gói: phần đầu, hiệu số %lu"
+
+#: apt-inst/deb/dpkgdb.cc:465
+#, c-format
+msgid "Bad ConfFile section in the status file. Offset %lu"
+msgstr ""
+"Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số %lu"
+
+#: apt-inst/deb/dpkgdb.cc:470
+#, c-format
+msgid "Error parsing MD5. Offset %lu"
+msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
+
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Đây không phải là môt kho DEB hợp lệ vì còn thiếu bộ phạn « %s »"
+
+#: apt-inst/deb/debfile.cc:52
+#, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr ""
+"Đây không phải là môt kho DEB hợp lệ vì không có bộ phạn « %s » hay « %s »"
+
+#: apt-inst/deb/debfile.cc:112
+#, c-format
+msgid "Couldn't change to %s"
+msgstr "Không thể chuyển đổi sang %s"
+
+#: apt-inst/deb/debfile.cc:138
+msgid "Internal error, could not locate member"
+msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn"
+
+#: apt-inst/deb/debfile.cc:171
+msgid "Failed to locate a valid control file"
+msgstr "Việc định vị tập tin điều khiển hợp lệ bị lỗi"
+
+#: apt-inst/deb/debfile.cc:256
+msgid "Unparsable control file"
+msgstr "Tập tin điều khiển không có khả năng phân tách"
+
+#: methods/cdrom.cc:114
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Không thể đọc cơ sở dữ liệu đĩa CD-ROM %s"
+
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Hãy sử dụng lệnh « apt-cdrom » để làm cho APT chấp nhận đĩa CD này. Không "
+"thể sử dụng lệnh « apt-get update » (lấy cập nhật) để thêm đĩa CD mới."
+
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
+msgstr "CD không đúng"
+
+#: methods/cdrom.cc:164
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr "Không thể tháo gắn kết đĩa CD-ROM trong %s. Có lẽ nó còn dùng."
+
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr "Không tìm thấy đĩa"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Không tìm thấy tập tin"
+
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
+msgstr "Việc lấy các thông tin bị lỗi"
+
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+msgid "Failed to set modification time"
+msgstr "Việc lập giờ sửa đổi bị lỗi"
+
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "Địa chỉ Mạng (URI) không hợp lệ: URI không thể bắt đầu với « // »"
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
+msgstr "Đang đăng nhập..."
+
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
+msgstr "Không thể quyết định tên ngang hàng"
+
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
+msgstr "Không thể quyết định tên cục bộ"
+
+#: methods/ftp.cc:204 methods/ftp.cc:232
+#, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s"
+
+#: methods/ftp.cc:210
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Lệnh USER (người dùng) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:217
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Đã ghi rõ máy phục vụ ủy nhiệm, nhưng mà chưa ghi rõ tập lệnh đăng nhập. « "
+"Acquire::ftp::ProxyLogin » là rỗng."
+
+#: methods/ftp.cc:265
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Lệnh tập lệnh đăng nhập « %s » đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:291
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Lệnh TYPE (kiểu) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Thời hạn kết nối"
+
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
+msgstr "Máy phục vụ đã đóng kết nối"
+
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Lỗi đọc"
+
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Một trả lời đã tràn bộ đệm."
+
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
+msgstr "Giao thức bị hỏng"
+
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Lỗi ghi"
+
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
+msgstr "Không thể tạo ổ cắm"
+
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
+msgstr "Không thể kết nối ổ cắm dữ liệu, kết nối đã quá giờ"
+
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
+msgstr "Không thể kết nối ổ cắm bị động."
+
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "getaddrinfo (lấy thông tin địa chỉ) không thể lấy ổ cắm lắng nghe"
+
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
+msgstr "Không thể đóng kết ổ cắm"
+
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
+msgstr "Không thể lắng nghe trên ổ cắm đó"
+
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
+msgstr "Không thể quyết định tên ổ cắm đó"
+
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
+msgstr "Không thể gởi lệnh PORT (cổng)"
+
+#: methods/ftp.cc:789
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Không biết nhóm địa chỉ %u (AF_*)"
+
+#: methods/ftp.cc:798
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Lệnh EPRT (thông báo lỗi) đã thất bại: máy phục vụ nói: %s"
+
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
+msgstr "Kết nối ổ cắm dữ liệu đã quá giờ"
+
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
+msgstr "Không thể chấp nhận kết nối"
+
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Gặp khó khăn băm tập tin"
+
+#: methods/ftp.cc:877
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Không thể lấy tập tin: máy phục vụ nói « %s »"
+
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Ổ cắm dữ liệu đã quá giờ"
+
+#: methods/ftp.cc:922
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Việc truyền dữ liệu bị lỗi: máy phục vụ nói « %s »"
+
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
+msgstr "Truy vấn"
+
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
+msgstr "Không thể gọi "
+
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Đang kết nối đến %s (%s)..."
+
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[Địa chỉ IP: %s %s]"
+
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Không thể tạo ổ cắm cho %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Không thể sở khởi kết nối đến %s:%s (%s)."
+
+#: methods/connect.cc:93
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Không thể kết nối đến %s:%s (%s), kết nối đã quá giờ"
+
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Không thể kết nối đến %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Đang kết nối đến %s..."
+
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Không thể tháo gỡ « %s »"
+
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời"
+
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)"
+
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
+msgstr "Không thể kết nối đến %s %s:"
+
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Không thể tháo gỡ « %s »"
+
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát."
+
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!"
+
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
+msgstr "Gặp ít nhất một chữ ký không hợp lệ."
+
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr " để kiểm chứng chữ ký (gnupg có được cài đặt chưa?)"
+
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
+msgstr "Gặp lỗi lạ khi thực hiện gpgv"
+
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
+msgstr "Những chữ ký theo đây là không hợp lệ:\n"
+
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+"Không thể kiểm chứng những chữ ký theo đây, vì khóa công không sẵn sàng:\n"
+
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr "Không thể mở ống dẫn cho %s"
+
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
+msgstr "Gặp lỗi đọc từ tiến trình %s"
+
+#: methods/http.cc:376
+msgid "Waiting for headers"
+msgstr "Đang đợi những phần đầu..."
+
+#: methods/http.cc:522
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Đã lấy một dòng đầu riêng lẻ chứa hơn %u ky tự"
+
+#: methods/http.cc:530
+msgid "Bad header line"
+msgstr "Dòng đầu sai"
+
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Máy phục vụ HTTP đã gởi một dòng đầu trả lời không hợp lệ"
+
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr ""
+"Máy phục vụ HTTP đã gởi một dòng đầu Content-Length (độ dài nội dụng) không "
+"hợp lệ"
+
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr ""
+"Máy phục vụ HTTP đã gởi một dòng đầu Content-Range (phạm vị nội dụng) không "
+"hợp lệ"
+
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
+msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị"
+
+#: methods/http.cc:626
+msgid "Unknown date format"
+msgstr "Không biết dạng ngày"
+
+#: methods/http.cc:773
+msgid "Select failed"
+msgstr "Việc chọn bị lỗi"
+
+#: methods/http.cc:778
+msgid "Connection timed out"
+msgstr "Kết nối đã quá giờ"
+
+#: methods/http.cc:801
+msgid "Error writing to output file"
+msgstr "Gặp lỗi khi ghi vào tập tin xuất"
+
+#: methods/http.cc:832
+msgid "Error writing to file"
+msgstr "Gặp lỗi khi ghi vào tập tin"
+
+#: methods/http.cc:860
+msgid "Error writing to the file"
+msgstr "Gặp lỗi khi ghi vào tập tin đó"
+
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối"
+
+#: methods/http.cc:876
+msgid "Error reading from server"
+msgstr "Gặp lỗi khi đọc từ máy phục vụ"
+
+#: methods/http.cc:1107
+msgid "Bad header data"
+msgstr "Dữ liệu dòng đầu sai"
+
+#: methods/http.cc:1124
+msgid "Connection failed"
+msgstr "Kết nối bị ngắt"
+
+#: methods/http.cc:1215
+msgid "Internal error"
+msgstr "Gặp lỗi nội bộ"
+
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
+msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng"
+
+#: apt-pkg/contrib/mmap.cc:87
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
+
+#: apt-pkg/contrib/strutl.cc:938
+#, c-format
+msgid "Selection %s not found"
+msgstr "Không tìm thấy vùng chọn %s"
+
+#: apt-pkg/contrib/configuration.cc:436
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Không nhận biết viết tắt kiểu: « %c »"
+
+#: apt-pkg/contrib/configuration.cc:494
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Đang mở tập tin cấu hình %s..."
+
+#: apt-pkg/contrib/configuration.cc:512
+#, c-format
+msgid "Line %d too long (max %d)"
+msgstr "Dòng %d quá dài (tối đa %d)"
+
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên."
+
+#: apt-pkg/contrib/configuration.cc:627
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai"
+
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị"
+
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu"
+
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau"
+
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây"
+
+#: apt-pkg/contrib/configuration.cc:704
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »"
+
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin"
+
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Lỗi."
+
+#: apt-pkg/contrib/progress.cc:156
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Xong"
+
+#: apt-pkg/contrib/cmndline.cc:80
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Không biết tùy chọn dòng lệnh « %c » [từ %s]."
+
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Không hiểu tùy chọn dòng lệnh %s"
+
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Tùy chọn dòng lệnh %s không phải bun (đúng/không đúng)"
+
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Tùy chọn %s cần đến một đối số."
+
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Tùy chọn %s: đặc tả mục cấu hình phải có một « =<giá_trị> »."
+
+#: apt-pkg/contrib/cmndline.cc:237
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Tùy chọn %s cần đến một đối số số nguyên, không phải « %s »"
+
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Tùy chọn « %s » quá dài"
+
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Không hiểu %s: hãy cố dùng true (đúng) hay false (không đúng)."
+
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Thao tác không hợp lệ %s"
+
+#: apt-pkg/contrib/cdromutl.cc:55
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Không thể lấy các thông tin cho điểm gắn kết %s"
+
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Không thể chuyển đổi sang %s"
+
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
+msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi"
+
+#: apt-pkg/contrib/fileutl.cc:82
+#, c-format
+msgid "Not using locking for read only lock file %s"
+msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s"
+
+#: apt-pkg/contrib/fileutl.cc:87
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Không thể mở tập tin khóa %s"
+
+#: apt-pkg/contrib/fileutl.cc:105
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s"
+
+#: apt-pkg/contrib/fileutl.cc:109
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Không thể lấy khóa %s"
+
+#: apt-pkg/contrib/fileutl.cc:377
+#, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Đã đợi %s nhưng mà chưa gặp nó"
+
+#: apt-pkg/contrib/fileutl.cc:387
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn."
+
+#: apt-pkg/contrib/fileutl.cc:390
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)"
+
+#: apt-pkg/contrib/fileutl.cc:392
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Tiến trình con %s đã thoát bất ngờ"
+
+#: apt-pkg/contrib/fileutl.cc:436
+#, c-format
+msgid "Could not open file %s"
+msgstr "Không thể mở tập tin %s"
+
+#: apt-pkg/contrib/fileutl.cc:492
+#, c-format
+msgid "read, still have %lu to read but none left"
+msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại"
+
+#: apt-pkg/contrib/fileutl.cc:522
+#, c-format
+msgid "write, still have %lu to write but couldn't"
+msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
+
+#: apt-pkg/contrib/fileutl.cc:597
+msgid "Problem closing the file"
+msgstr "Gặp lỗi khi đóng tập tin đó"
+
+#: apt-pkg/contrib/fileutl.cc:603
+msgid "Problem unlinking the file"
+msgstr "Gặp lỗi khi bỏ liên kết tập tin đó"
+
+#: apt-pkg/contrib/fileutl.cc:614
+msgid "Problem syncing the file"
+msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó"
+
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
+msgstr "Bộ nhớ tạm gói rỗng"
+
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
+msgstr "Tập tin bộ nhớ tạm gói bị hỏng"
+
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
+msgstr "Tập tin bộ nhớ tạm gói là một phiên bản không tương thích"
+
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Trình APT này không hỗ trợ hệ thống điều khiển phiên bản « %s »"
+
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
+msgstr "Bộ nhớ tạm gói được xây dụng cho kiến trức khác"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
+msgstr "Phụ thuộc"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
+msgstr "Phụ thuộc trước"
+
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
+msgstr "Đệ nghị"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
+msgstr "Khuyên"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
+msgstr "Xung đột"
+
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
+msgstr "Thay thế"
+
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
+msgstr "Làm cũ"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
+msgstr "quan trọng"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
+msgstr "cần"
+
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
+msgstr "chuẩn"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
+msgstr "tùy chọn"
+
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
+msgstr "thêm"
+
+#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+msgid "Building dependency tree"
+msgstr "Đang xây dụng cây cách phụ thuộc..."
+
+#: apt-pkg/depcache.cc:61
+msgid "Candidate versions"
+msgstr "Phiên bản ứng cử"
+
+#: apt-pkg/depcache.cc:90
+msgid "Dependency generation"
+msgstr "Tạo ra cách phụ thuộc"
+
+#: apt-pkg/tagfile.cc:72
+#, 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:102
+#, c-format
+msgid "Unable to parse package file %s (2)"
+msgstr "Không thể phân tách tập tin gói %s (2)"
+
+#: apt-pkg/sourcelist.cc:94
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ Mạng)"
+
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr ""
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ Mạng)."
+
+#: apt-pkg/sourcelist.cc:105
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)"
+
+#: apt-pkg/sourcelist.cc:112
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)"
+
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
+msgstr "Đang mở %s..."
+
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Dòng %u quá dài trong danh sách nguồn %s."
+
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)."
+
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s."
+
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)"
+
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Việc chạy tiến trình cài đặt này sẽ cần thiết gỡ bỏ tạm gói chủ yếu %s, do "
+"vong lăp Xung đột/Phụ thuộc trước. Trường hợp này thường xấu, nhưng mà nếu "
+"bạn thật sự muốn tiếp tục, có thể hoạt hóa tuy chọn « APT::Force-LoopBreak "
+"» (buộc ngắt vòng lặp)."
+
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Không hỗ trợ kiểu tập tin chỉ mục « %s »"
+
+#: apt-pkg/algorithms.cc: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 »."
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Đang tải về tập tin %li trên %li (%s còn lại)"
+
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Đang đọc danh sách tập tin..."
+
+#: apt-pkg/acquire-worker.cc:113
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Không tìm thấy trình điều khiển phương pháp %s."
+
+#: apt-pkg/acquire-worker.cc:162
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Phương pháp %s đã không bắt đầu cho đúng."
+
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr "Hãy nạp đĩa có nhãn « %s » vào ổ « %s » và bấm nút Enter."
+
+#: apt-pkg/init.cc: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ể lấy các thông tin về %s."
+
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr ""
+"Bạn phải để một số địa chỉ Mạng « nguồn » vào « sources.list » (danh sách "
+"nguồn)"
+
+#: apt-pkg/cachefile.cc:73
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Không thể phân tách hay mở danh sách gói hay tâp tin trạng thái."
+
+#: apt-pkg/cachefile.cc:77
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này"
+
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
+msgstr ""
+"Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package "
+"(Gói)."
+
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Không hiểu kiểu ghim %s"
+
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
+msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim"
+
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
+msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tương thích"
+
+#: apt-pkg/pkgcachegen.cc:117
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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 "Ồ, 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 "Ồ, 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 "Ồ, 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
+#, 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
+#, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr ""
+"Gặp lỗi khi xử lý %s (CollectFileProvides - tập hợp các trường hợp miễn là "
+"một tập tin)"
+
+#: apt-pkg/pkgcachegen.cc: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ể lấy các thông tin về 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 « tập tin miễn là »"
+
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
+msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn"
+
+#: apt-pkg/acquire-item.cc:126
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)."
+
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
+msgstr "MD5Sum (tổng kiểm) không khớp được"
+
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n"
+
+#: apt-pkg/acquire-item.cc:753
+#, c-format
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"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:812
+#, c-format
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"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:848
+#, c-format
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+"Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập "
+"tin:) cho gói %s."
+
+#: apt-pkg/acquire-item.cc:935
+msgid "Size mismatch"
+msgstr "Kích cỡ không khớp được"
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Khối nhà bán %s không chứa vân tay"
+
+#: apt-pkg/cdrom.cc:507
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+"Đang dùng điểm lắp đĩa CD-ROM %s\n"
+"Đang lắp đĩa CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
+msgstr "Đang nhận diện... "
+
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
+msgstr "Nhãn đã lưu : %s\n"
+
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr "Đang dùng điểm lắp đĩa CD-ROM %s\n"
+
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
+msgstr "Đang tháo lắp đĩa CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
+msgstr "Đang đợi đĩa...\n"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
+msgstr "Đang lắp đĩa CD-ROM...\n"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
+msgstr "Đang quét đĩa tìm tập tin chỉ mục...\n"
+
+#: apt-pkg/cdrom.cc:647
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr "Mới tìm %i chỉ mục gói, %i chỉ mục nguồn và %i chữ ký\n"
+
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
+msgstr "Nó không phải là một tên hợp lệ: hãy thử lại.\n"
+
+#: apt-pkg/cdrom.cc:726
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+"Tên đĩa này:\n"
+"%s\n"
+
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
+msgstr "Đang sao chép các danh sách gói..."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
+msgstr "Đang ghi danh sách nguồn mới...\n"
+
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
+msgstr "Các mục nhập danh sách nguồn cho đĩa này:\n"
+
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
+msgstr "Đang tháo lắp đĩa CD-ROM..."
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr "Mới ghi %i mục ghi.\n"
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Mới ghi %i mục ghi với %i tập tin còn thiếu.\n"
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Mới ghi %i mục ghi với %i tập tin không khớp với nhau\n"
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+"Mới ghi %i mục ghi với %i tập tin còn thiếu và %i tập tin không khớp với "
+"nhau\n"
+
+#: apt-pkg/deb/dpkgpm.cc:358
+#, c-format
+msgid "Preparing %s"
+msgstr "Đang chuẩn bị %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr "Đang mở gói %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr "Đang chuẩn bị cấu hình %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr "Đang cấu hình %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr "Đã cài đặt %s"
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr "Đang chuẩn bị gỡ bỏ %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr "Đang gỡ bỏ %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr "Đã gỡ bỏ %s"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Đang chuẩn bị cấu hình %s..."
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Việc gỡ bỏ %s bị lỗi"
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Kết nối bị đóng quá sớm."
+
+#~ msgid "Reading file list"
+#~ msgstr "Đang đọc danh sách tâp tin..."
+
+#~ msgid "Could not execute "
+#~ msgstr "Không thể thực hiện "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Đang chuẩn bị gỡ bỏ với cấu hình %s..."
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Mới gỡ bỏ với cấu hình %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 34cfbb679..f887f3328 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,15 +1,15 @@
 # Chinese/Simplified translation of apt.
 # This file is put in the public domain.
 # Tchaikov <tchaikov@sjtu.edu.cn>, 2005.
-# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004.
+# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-30 08:37+0100\n"
-"PO-Revision-Date: 2005-11-15 00:05+0800\n"
-"Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
+"PO-Revision-Date: 2006-02-22 14:20+1300\n"
+"Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -146,14 +146,14 @@ msgstr "  版本列表："
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s for %s %s ，编译于 %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -512,7 +512,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " 达到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法读取 %s 的状态"
@@ -626,79 +626,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -706,143 +706,143 @@ 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 "忽略了认证警告。\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
+#: cmdline/apt-get.cc:775
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部错误，Ordering 没有完成"
 
-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "无法对下载目录加锁"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "无法读取安装源列表。"
 
-#: cmdline/apt-get.cc: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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "无法获知您在 %s 上的空余空间"
 
-#: cmdline/apt-get.cc: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
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -853,28 +853,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "无法下载 %s  %s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "有一些文件下载失败"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -882,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"
@@ -933,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr " update 命令是不需任何参数的"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "无法对状态列表目录加锁"
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部错误，AllUpgrade 坏事了"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "您可能需要运行“apt-get -f install”来纠正下列错误："
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1008,7 +1008,7 @@ msgstr ""
 "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可"
 "以指定一个解决办法)。"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1019,7 +1019,7 @@ msgstr ""
 "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n"
 "包尚未被创建或是它们还在新到(incoming)目录中。"
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1028,121 +1028,126 @@ msgstr ""
 "您仅要求对单一软件包进行操作，这极有可能是因为该软件包安装不上，同时，\n"
 "您最好提交一个针对这个软件包的故障报告。"
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "下列的信息可能会对解决问题有所帮助："
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "无法安装的软件包"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "将会安装下列额外的软件包："
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "建议安装的软件包："
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "推荐安装的软件包："
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "正在筹划升级... "
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "失败"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部错误，problem resolver 坏事了"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "要下载源代码，必须指定至少一个对应的软件包"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "无法找到与 %s 对应的源代码包"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "忽略已下载过的文件“%s”\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "您在 %s 上没有足够的空余空间"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下载 %sB/%sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下载 %sB 的源代码包。\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下载源代码 %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "有一些包文件无法下载。"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "对于已经被解包到 %s 目录的源代码包就不再解开了\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "运行解包的命令“%s”出错。\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "请检查是否安装了“dpkg-dev”软件包。\n"
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "执行构造软件包命令“%s”失败。\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "子进程出错"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr "要检查生成软件包的构建依赖关系(builddeps)，必须指定至少一个软件包"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "无法获得 %s 的构建依赖关系(build-dependency)信息"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr " %s 没有构建依赖关系信息。\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1151,30 +1156,30 @@ msgstr ""
 "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1"
 "$s 依赖关系"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "不能满足软件包 %s 所要求的构建依赖关系。"
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "被支持模块："
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1524,7 +1529,7 @@ msgstr "无法切换工作目录到 admin 目录 %sinfo"
 msgid "Internal error getting a package name"
 msgstr "在获取软件包名字时出现内部错误"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "正在读取文件列表"
 
@@ -1570,10 +1575,6 @@ msgstr "添加 diversion 时出现内部错误"
 msgid "The pkg cache must be initialized first"
 msgstr "必须首先初始化软件包缓存"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "正在读取文件列表"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1646,12 +1647,12 @@ msgstr "找不到光盘。"
 msgid "File not found"
 msgstr "无法找到该文件"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "无法读取状态"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "无法设置文件的修改日期"
 
@@ -1778,7 +1779,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
@@ -1801,7 +1802,7 @@ msgstr "数据传送出错，服务器响应道“%s”"
 msgid "Query"
 msgstr "查询"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
@@ -1830,69 +1831,70 @@ msgstr "无法发起与 %s:%s (%s) 的连接"
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "无法连接上 %s:%s (%s)，连接超时"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "无法连接上 %s:%s (%s)。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在连接 %s"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "无法解析域名“%s”"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "解析“%s:%s”时，出现了某些故障 (%i)"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "不能连接上 %s %s："
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "无法解析域名“%s”"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr "错误：Acquire::gpgv::Options 的参数列表超长。结束运行。"
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr "内部错误：签名正确无误，但是无法确认密钥的指纹(key fingerprint)？！"
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "未能执行 "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr "用于验证签名(您安装了 gnupg 么？)"
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr "运行 gpgv 时发生未知错误"
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 msgid "The following signatures were invalid:\n"
 msgstr "下列签名无效：\n"
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1908,76 +1910,76 @@ msgstr "无法为 %s 开启管道"
 msgid "Read error from %s process"
 msgstr "从 %s 进程读取数据出错"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "正在等待报头"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "受到了一行报头条目，它的长度超过了 %u 个字符"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "错误的报头条目"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "该 http 服务器发送了一个无效的应答报头"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "该 http 服务器发送了一个无效的 Content-Length 报头"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "该 http 服务器发送了一个无效的 Content-Range 报头"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "该 http 服务器的 range 支持不正常"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "无法识别的日期格式"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "连接服务器超时"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -2268,12 +2270,12 @@ msgstr "候选版本"
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "无法解析软件包文件 %s (1)"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
@@ -2319,7 +2321,7 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
+#, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
@@ -2374,11 +2376,18 @@ msgstr "软件包列表的目录 %spartial 不见了。"
 msgid "Archive directory %spartial is missing."
 msgstr "找不到“%spartial”这个目录。"
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件(共 %li 个，尚需 %s)"
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "正在读取文件列表"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2517,11 +2526,15 @@ msgstr "无法写入来源缓存文件"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5 校验和不符"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "以下 key ID 没有可用的公钥：\n"
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2530,7 +2543,7 @@ msgstr ""
 "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件"
 "包。(缘于架构缺失)"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2538,13 +2551,13 @@ msgid ""
 msgstr ""
 "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。"
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。"
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "大小不符"
 
@@ -2688,19 +2701,31 @@ msgid "Removed %s"
 msgstr "已删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "正在准备连同配置文件的删除 %s"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "正在准备配置 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "连同配置文件一同删除 %s "
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "无法删除 %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "连接被永久关闭"
 
+#~ msgid "Reading file list"
+#~ msgstr "正在读取文件列表"
+
+#~ msgid "Could not execute "
+#~ msgstr "未能执行 "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "正在准备连同配置文件的删除 %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "连同配置文件一同删除 %s "
+
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
 #~ "在安装源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4d8082214..e9e27bbf1 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-11-30 08:37+0100\n"
+"POT-Creation-Date: 2006-05-16 07:33-0500\n"
 "PO-Revision-Date: 2005-02-19 22:24+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -147,14 +147,14 @@ msgstr "  版本表格:"
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2352 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr "%s %s 是針對於 %s %s 並編譯在 %s %s\n"
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -518,7 +518,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " 達到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr "無法取得 %s 的狀態"
@@ -632,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:1513
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
 #, 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"
@@ -713,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:1807 cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
 msgid "Unable to lock the download directory"
 msgstr "無法鎖定下載的目錄"
 
-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1888 cmdline/apt-get.cc:2100
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr "無法讀取來源單。"
 
-#: cmdline/apt-get.cc: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:1954
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
 #, 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"
@@ -861,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:1363 cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "無法下載『%s』檔案。%s\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr "部份檔案無法下載"
 
-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
 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?"
@@ -890,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"
@@ -941,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:1311
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr "update 指令不需任何參數"
 
-#: cmdline/apt-get.cc:1324 cmdline/apt-get.cc:1418
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr "無法鎖定列表目錄"
 
-#: cmdline/apt-get.cc:1382
+#: 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:1401
+#: cmdline/apt-get.cc:1403
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
-#: cmdline/apt-get.cc:1500 cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "無法找到 %s 套件。"
 
-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1516
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意,根據正規表示法“%2$s”選擇了 %1$s\n"
 
-#: cmdline/apt-get.cc:1553
+#: cmdline/apt-get.cc:1546
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "用『apt-get -f install』指令或許能修正這些問題。"
 
-#: cmdline/apt-get.cc:1556
+#: cmdline/apt-get.cc:1549
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1015,7 +1015,7 @@ msgstr ""
 "無法滿足的相依關係。請嘗試不指定套件明成來執行“apt-get -f install”(或指>\n"
 "定一個解決辦法)。"
 
-#: cmdline/apt-get.cc:1568
+#: cmdline/apt-get.cc:1561
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1026,7 +1026,7 @@ msgstr ""
 "或是您使用不穩定(unstable)發行版而這些需要的套件尚未完成\n"
 "或從 Incoming 目錄移除。"
 
-#: cmdline/apt-get.cc:1576
+#: cmdline/apt-get.cc:1569
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
@@ -1036,122 +1036,127 @@ msgstr ""
 "該套件無法安裝,您最好提交一個針對這個套件\n"
 "的臭蟲報告。"
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1574
 msgid "The following information may help to resolve the situation:"
 msgstr "底下的資訊有助於解決現在的情況:"
 
-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1577
 msgid "Broken packages"
 msgstr "損毀的套件"
 
-#: cmdline/apt-get.cc:1610
+#: cmdline/apt-get.cc:1603
 msgid "The following extra packages will be installed:"
 msgstr "下列的【新】套件都將被安裝："
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1674
 msgid "Suggested packages:"
 msgstr "建議(Suggested)的套件:"
 
-#: cmdline/apt-get.cc:1682
+#: cmdline/apt-get.cc:1675
 msgid "Recommended packages:"
 msgstr "推薦(Recommended)的套件:"
 
-#: cmdline/apt-get.cc:1702
+#: cmdline/apt-get.cc:1695
 msgid "Calculating upgrade... "
 msgstr "籌畫升級套件中..."
 
-#: cmdline/apt-get.cc:1705 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1703
 msgid "Done"
 msgstr "完成"
 
-#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1783
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "內部錯誤,AllUpgrade 造成錯誤"
 
-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1876
 msgid "Must specify at least one package to fetch source for"
 msgstr "必須指定至少一個對應的套件才能下載源碼"
 
-#: cmdline/apt-get.cc:1910 cmdline/apt-get.cc:2118
+#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "無法找到 %s 套件的源碼"
 
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1950
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
+
+#: cmdline/apt-get.cc:1974
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "『%s』內沒有足夠的空間。"
 
-#: cmdline/apt-get.cc:1962
+#: cmdline/apt-get.cc:1979
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "需要下載 %2$sB 中 %1$sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:1965
+#: cmdline/apt-get.cc:1982
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "需要下載 %sB 的原始檔案。\n"
 
-#: cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:1988
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "下載源碼 %s\n"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2019
 msgid "Failed to fetch some archives."
 msgstr "無法下載某些檔案。"
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2047
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "略過已經被解開到 %s 目錄的源碼檔案\n"
 
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2059
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "執行解開套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2043
+#: cmdline/apt-get.cc:2060
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2060
+#: cmdline/apt-get.cc:2077
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "執行建立套件指令 '%s' 時失敗。\n"
 
-#: cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096
 msgid "Child process failed"
 msgstr "子程序失敗"
 
-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2112
 msgid "Must specify at least one package to check builddeps for"
 msgstr "必須指定至少一個套件才能檢查其建立相依關係(builddeps)"
 
-#: cmdline/apt-get.cc:2123
+#: cmdline/apt-get.cc:2140
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "無法取得 %s 的建構相依關係。"
 
-#: cmdline/apt-get.cc:2143
+#: cmdline/apt-get.cc:2160
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s 無建立相依關係訊息。\n"
 
-#: cmdline/apt-get.cc:2195
+#: cmdline/apt-get.cc:2212
 #, 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:2247
+#: cmdline/apt-get.cc:2264
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1160,30 +1165,30 @@ msgstr ""
 "由於無法找到符合要求的套件 %3$s 的可用版本,因此不能滿足 %2$s 所要求的 %1$s 的"
 "相依關係"
 
-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2299
 #, 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:2307
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "無法滿足 %2$s 所要求 %1$s 相依關係:%3$s"
 
-#: cmdline/apt-get.cc:2321
+#: cmdline/apt-get.cc:2338
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "無法滿足套件 %s 所要求的建構相依關係。"
 
-#: cmdline/apt-get.cc:2325
+#: cmdline/apt-get.cc:2342
 msgid "Failed to process build dependencies"
 msgstr "無法處理建構相依關係"
 
-#: cmdline/apt-get.cc:2357
+#: cmdline/apt-get.cc:2374
 msgid "Supported modules:"
 msgstr "支援模組:"
 
-#: cmdline/apt-get.cc:2398
+#: cmdline/apt-get.cc:2415
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1535,7 +1540,7 @@ msgstr "無法變換 admin 目錄至 %sinfo"
 msgid "Internal error getting a package name"
 msgstr "內部錯誤，無法取得套件名稱"
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
 msgid "Reading file listing"
 msgstr "讀取軟件表中"
 
@@ -1581,10 +1586,6 @@ msgstr "內部錯誤：新增轉移(diversion)失敗"
 msgid "The pkg cache must be initialized first"
 msgstr "套件快取必須先初始化"
 
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "讀取軟件表中"
-
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
@@ -1658,12 +1659,12 @@ msgstr "找不到檔案"
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "無法讀取資料"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "日期更新失敗"
 
@@ -1789,7 +1790,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 
@@ -1812,7 +1813,7 @@ msgstr "資料傳輸失敗，伺服器回應 %s"
 msgid "Query"
 msgstr "查詢"
 
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
 msgid "Unable to invoke "
 msgstr "無法讀取 "
 
@@ -1841,71 +1842,71 @@ msgstr "無法聯絡到主機『%s:%s (%s)』。"
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
-#: methods/connect.cc:106
+#: methods/connect.cc:108
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "無法聯絡到主機『%s:%s (%s)』。"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
 #, c-format
 msgid "Connecting to %s"
 msgstr "聯絡主機『%s』中"
 
-#: methods/connect.cc:165
+#: methods/connect.cc:167
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "無法解析位置 %s"
 
-#: methods/connect.cc:171
+#: methods/connect.cc:173
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "解析『%s』暫時失敗"
 
-#: methods/connect.cc:174
+#: methods/connect.cc:176
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "無法解析『%s:%s (%i)』。"
 
-#: methods/connect.cc:221
+#: methods/connect.cc:223
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "無法聯絡到主機『%s %s』："
 
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "無法解析位置 %s"
+
+#: methods/gpgv.cc:99
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:198
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:203
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-#, fuzzy
-msgid "Could not execute "
-msgstr "無法取得『%s』鎖。"
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
 msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "下列的【新】套件都將被安裝："
 
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1921,76 +1922,76 @@ msgstr "無法開啟管線給 %s 使用"
 msgid "Read error from %s process"
 msgstr "從 %s 進程讀取錯誤"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "等待標頭"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "取得一個單行超過 %u 字元的標頭"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "壞的標頭"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "http 伺服器傳送一個無效的回覆標頭"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "http 伺服器傳送一個無效的 Content-Length 標頭"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "http 伺服器傳送一個無效的 Content-Range 標頭"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "http 伺服器有損毀的範圍支援"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "未知的資料格式"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Select 失敗"
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "寫入輸出檔時發生錯誤"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "從遠端主機讀取錯誤，關閉連線"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "壞的標頭資料"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2281,12 +2282,12 @@ msgstr "候選版本"
 msgid "Dependency generation"
 msgstr "產生套件依存關係"
 
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:72
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "無法辨識套件『%s』(1)。"
 
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件『%s』(1)。"
@@ -2382,11 +2383,18 @@ msgstr "找不到『%spartial』清單目錄。"
 msgid "Archive directory %spartial is missing."
 msgstr "找不到『%spartial』檔案目錄。"
 
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "讀取軟件表中"
+
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
@@ -2528,31 +2536,35 @@ msgstr "無法寫入來源暫存檔。"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "檔名因『%s』更換失敗 (%s → %s)。"
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
 msgid "MD5Sum mismatch"
 msgstr "MD5 檢查碼不符合。"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:753
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:812
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr "找不到套件『%s』需要的某檔案。請您修理這個套件再試試。"
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:848
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件『%s』索引檔損壞—缺少『Filename:』欄。"
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:935
 msgid "Size mismatch"
 msgstr "檔案大小不符合。"
 
@@ -2696,15 +2708,22 @@ msgid "Removed %s"
 msgstr "推薦"
 
 #: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "開啟組態檔 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "無法移除 %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "連線不預期的結束"
+
+#~ msgid "Reading file list"
+#~ msgstr "讀取軟件表中"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "無法取得『%s』鎖。"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg.moved
index bb5ed5033..bb5ed5033 100644
--- a/share/debian-archive.gpg
+++ b/share/debian-archive.gpg.moved
diff --git a/test/testdeb.cc b/test/testdeb.cc
index 5986621bb..d28f20114 100644
--- a/test/testdeb.cc
+++ b/test/testdeb.cc
@@ -23,7 +23,7 @@ bool Test(const char *File)
       return false;
       
    // Extract it.
-   ExtractTar Tar(Deb.GetFile(),Member->Size);
+   ExtractTar Tar(Deb.GetFile(),Member->Size, "gzip");
    NullStream Dir;
    if (Tar.Go(Dir) == false)
       return false;   
diff --git a/test/versions.lst b/test/versions.lst
index 008a0f2d7..efc19c4f0 100644
--- a/test/versions.lst
+++ b/test/versions.lst
@@ -20,6 +20,13 @@ z . -1
 # Epochs
 1:0.4 10.3 1
 1:1.25-4 1:1.25-8 -1
+0:1.18.36 1.18.36 0
+
+# Funky, but allowed, characters in upstream version
+9:1.18.36:5.4-20 10:0.5.1-22 -1
+9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1
+9:1.18.36:5.4-20 9:1.18.37:4.3-22 -1
+1.18.36-0.17.35-18 1.18.36-19 1
 
 # Junk
 1:1.2.13-3 1:1.2.13-3.1 -1
author	Michael Vogt <michael.vogt@ubuntu.com>	2006-06-26 06:30:09 +0200
committer	Michael Vogt <michael.vogt@ubuntu.com>	2006-06-26 06:30:09 +0200
commit	a23dcda4a75ead3ef9712d90300f45155856b6ce (patch)
tree	8951be2e20b5403c4339fa246b59d7770c8e2e46
parent	bc03039d0f532b6463de33bff60c7d876af6ea5e (diff)
parent	b90d7d855709c49a6d5faff0ac65b96fd15e4500 (diff)