merged from the debian-sid branch

61 files changed, 15287 insertions, 10133 deletions

diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2f5fcc7ab..1b0161ffd 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -194,6 +194,11 @@ bool pkgSimulate::Remove(PkgIterator iPkg,bool Purge)
 {
    // Adapt the iterator
    PkgIterator Pkg = Sim.FindPkg(iPkg.Name(), iPkg.Arch());
+   if (Pkg.end() == true)
+   {
+      std::cerr << (Purge ? "Purg" : "Remv") << " invalid package " << iPkg.FullName() << std::endl;
+      return false;
+   }
 
    Flags[Pkg->ID] = 3;
    Sim.MarkDelete(Pkg);
diff --git a/apt-pkg/contrib/netrc.cc b/apt-pkg/contrib/netrc.cc
index 2321ef063..0a902f126 100644
--- a/apt-pkg/contrib/netrc.cc
+++ b/apt-pkg/contrib/netrc.cc
@@ -45,11 +45,11 @@ enum {
 #define NETRC DOT_CHAR "netrc"
 
 /* returns -1 on failure, 0 if the host is found, 1 is the host isn't found */
-int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+static int parsenetrc_string (char *host, std::string &login, std::string &password, char *netrcfile = NULL)
 {
   FILE *file;
   int retcode = 1;
-  int specific_login = (login[0] != 0);
+  int specific_login = (login.empty() == false);
   char *home = NULL;
   bool netrc_alloc = false;
 
@@ -80,16 +80,17 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
     char *tok;
     char *tok_buf;
     bool done = false;
-    char netrcbuffer[256];
+    char *netrcbuffer = NULL;
+    size_t netrcbuffer_size = 0;
 
     int state = NOTHING;
     char state_login = 0;        /* Found a login keyword */
     char state_password = 0;     /* Found a password keyword */
 
-    while (!done && fgets(netrcbuffer, sizeof (netrcbuffer), file)) {
+    while (!done && getline(&netrcbuffer, &netrcbuffer_size, file) != -1) {
       tok = strtok_r (netrcbuffer, " \t\n", &tok_buf);
       while (!done && tok) {
-        if(login[0] && password[0]) {
+        if(login.empty() == false && password.empty() == false) {
           done = true;
           break;
         }
@@ -121,23 +122,13 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
           /* we are now parsing sub-keywords concerning "our" host */
           if (state_login) {
             if (specific_login)
-              state_our_login = !strcasecmp (login, tok);
+              state_our_login = !strcasecmp (login.c_str(), tok);
             else
-            {
-              if (strlen(tok) > LOGINSIZE)
-                 _error->Error("login token too long %i (max: %i)", 
-                               strlen(tok), LOGINSIZE);
-              strncpy (login, tok, LOGINSIZE - 1);
-            }
+              login = tok;
             state_login = 0;
           } else if (state_password) {
-             if (state_our_login || !specific_login) 
-             {
-              if (strlen(tok) > PASSWORDSIZE)
-                 _error->Error("password token too long %i (max %i)", 
-                               strlen(tok), PASSWORDSIZE);
-              strncpy (password, tok, PASSWORDSIZE - 1);
-             }
+            if (state_our_login || !specific_login)
+              password = tok;
             state_password = 0;
           } else if (!strcasecmp ("login", tok))
             state_login = 1;
@@ -153,8 +144,9 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
 
         tok = strtok_r (NULL, " \t\n", &tok_buf);
       } /* while(tok) */
-    } /* while fgets() */
+    } /* while getline() */
 
+    free(netrcbuffer);
     fclose(file);
   }
 
@@ -163,6 +155,18 @@ int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
 
   return retcode;
 }
+// for some unknown reason this method is exported so keep a compatible interface for now …
+int parsenetrc (char *host, char *login, char *password, char *netrcfile = NULL)
+{
+   std::string login_string, password_string;
+   int const ret = parsenetrc_string(host, login_string, password_string, netrcfile);
+   if (ret < 0)
+      return ret;
+   strncpy(login, login_string.c_str(), LOGINSIZE - 1);
+   strncpy(password, password_string.c_str(), PASSWORDSIZE - 1);
+   return ret;
+}
+
 
 void maybe_add_auth (URI &Uri, string NetRCFile)
 {
@@ -173,21 +177,20 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
   {
     if (NetRCFile.empty () == false)
     {
-      char login[LOGINSIZE] = "";
-      char password[PASSWORDSIZE] = "";
+       std::string login, password;
       char *netrcfile = strdup(NetRCFile.c_str());
 
       // first check for a generic host based netrc entry
       char *host = strdup(Uri.Host.c_str());
-      if (host && parsenetrc (host, login, password, netrcfile) == 0)
+      if (host && parsenetrc_string(host, login, password, netrcfile) == 0)
       {
 	 if (_config->FindB("Debug::Acquire::netrc", false) == true)
 	    std::clog << "host: " << host 
 		      << " user: " << login
-		      << " pass-size: " << strlen(password)
+		      << " pass-size: " << password.size()
 		      << std::endl;
-        Uri.User = string (login);
-        Uri.Password = string (password);
+        Uri.User = login;
+        Uri.Password = password;
 	free(netrcfile);
 	free(host);
 	return;
@@ -198,15 +201,15 @@ void maybe_add_auth (URI &Uri, string NetRCFile)
       // a lookup uri.startswith(host) in the netrc file parser (because
       // of the "/"
       char *hostpath = strdup(string(Uri.Host+Uri.Path).c_str());
-      if (hostpath && parsenetrc (hostpath, login, password, netrcfile) == 0)
+      if (hostpath && parsenetrc_string(hostpath, login, password, netrcfile) == 0)
       {
 	 if (_config->FindB("Debug::Acquire::netrc", false) == true)
 	    std::clog << "hostpath: " << hostpath
 		      << " user: " << login
-		      << " pass-size: " << strlen(password)
+		      << " pass-size: " << password.size()
 		      << std::endl;
-	 Uri.User = string (login);
-	 Uri.Password = string (password);
+	 Uri.User = login;
+	 Uri.Password = password;
       }
       free(netrcfile);
       free(hostpath);
diff --git a/apt-pkg/contrib/netrc.h b/apt-pkg/contrib/netrc.h
index 5931d4a42..6feb5b726 100644
--- a/apt-pkg/contrib/netrc.h
+++ b/apt-pkg/contrib/netrc.h
@@ -25,11 +25,9 @@
 
 class URI;
 
-// Assume: password[0]=0, host[0] != 0.
-// If login[0] = 0, search for login and password within a machine section
-// in the netrc.
-// If login[0] != 0, search for password within machine and login.
-int parsenetrc (char *host, char *login, char *password, char *filename);
+// kill this export on the next ABI break - strongly doubt its in use anyway
+// outside of the apt itself, its really a internal interface
+__deprecated int parsenetrc (char *host, char *login, char *password, char *filename);
 
 void maybe_add_auth (URI &Uri, std::string NetRCFile);
 #endif
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 12c6ab4c9..b84bd6fdd 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -645,6 +645,8 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
 	      a != Architectures.end(); ++a)
 	    if (NewDepends(Ver,Package,*a,Version,Op,Type) == false)
 	       return false;
+	 if (NewDepends(Ver,Package,"none",Version,Op,Type) == false)
+	    return false;
       }
       else if (MultiArchEnabled == true && found != string::npos &&
 	       strcmp(Package.c_str() + found, ":any") != 0)
@@ -658,8 +660,18 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
 	 if (NewDepends(Ver,Package,Arch,Version,Op,Type) == false)
 	    return false;
       }
-      else if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
-	 return false;
+      else
+      {
+	 if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
+	    return false;
+	 if ((Type == pkgCache::Dep::Conflicts ||
+	      Type == pkgCache::Dep::DpkgBreaks ||
+	      Type == pkgCache::Dep::Replaces) &&
+	     NewDepends(Ver, Package,
+			(pkgArch != "none") ? "none" : _config->Find("APT::Architecture"),
+			Version,Op,Type) == false)
+	    return false;
+      }
       if (Start == Stop)
 	 break;
    }
@@ -753,13 +765,15 @@ bool debListParser::Step()
          drop the whole section. A missing arch tag only happens (in theory)
          inside the Status file, so that is a positive return */
       string const Architecture = Section.FindS("Architecture");
-      if (Architecture.empty() == true)
-	 return true;
 
       if (Arch.empty() == true || Arch == "any" || MultiArchEnabled == false)
       {
 	 if (APT::Configuration::checkArchitecture(Architecture) == true)
 	    return true;
+	 /* parse version stanzas without an architecture only in the status file
+	    (and as misfortune bycatch flat-archives) */
+	 if ((Arch.empty() == true || Arch == "any") && Architecture.empty() == true)
+	    return true;
       }
       else
       {
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 4f0957b8e..8732fba88 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1130,7 +1130,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 	    if (I->Op == Item::Configure && disappearedPkgs.find(I->Pkg.Name()) != disappearedPkgs.end())
 	       continue;
 	    // We keep this here to allow "smooth" transitions from e.g. multiarch dpkg/ubuntu to dpkg/debian
-	    if (dpkgMultiArch == false && (I->Pkg.Arch() == nativeArch || !strcmp(I->Pkg.Arch(), "all")))
+	    if (dpkgMultiArch == false && (I->Pkg.Arch() == nativeArch ||
+					   strcmp(I->Pkg.Arch(), "all") == 0 ||
+					   strcmp(I->Pkg.Arch(), "none") == 0))
 	    {
 	       char const * const name = I->Pkg.Name();
 	       ADDARG(name);
@@ -1147,7 +1149,9 @@ bool pkgDPkgPM::Go(int OutStatusFd)
                }
 	       else
 		  PkgVer = Cache[I->Pkg].InstVerIter(Cache);
-               if (PkgVer.end() == false)
+	       if (strcmp(I->Pkg.Arch(), "none") == 0)
+		  ; // never arch-qualify a package without an arch
+	       else if (PkgVer.end() == false)
                   name.append(":").append(PkgVer.Arch());
                else
                   _error->Warning("Can not find PkgVer for '%s'", name.c_str());
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 2656e9b42..deb8ec21f 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -346,7 +346,7 @@ bool pkgDepCache::CheckDep(DepIterator Dep,int Type,PkgIterator &Res)
    /* Check simple depends. A depends -should- never self match but 
       we allow it anyhow because dpkg does. Technically it is a packaging
       bug. Conflicts may never self match */
-   if (Dep.TargetPkg() != Dep.ParentPkg() || Dep.IsNegative() == false)
+   if (Dep.IsIgnorable(Res) == false)
    {
       PkgIterator Pkg = Dep.TargetPkg();
       // Check the base package
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index adb8788b3..6ce9da784 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -214,9 +214,11 @@ bool EDSP::WriteRequest(pkgDepCache &Cache, FILE* output, bool const Upgrade,
       if (Progress != NULL && p % 100 == 0)
          Progress->Progress(p);
       string* req;
-      if (Cache[Pkg].Delete() == true)
+      pkgDepCache::StateCache &P = Cache[Pkg];
+      if (P.Delete() == true)
 	 req = &del;
-      else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
+      else if (P.NewInstall() == true || P.Upgrade() == true || P.ReInstall() == true ||
+	       (P.Mode == pkgDepCache::ModeKeep && (P.iFlags & pkgDepCache::Protected) == pkgDepCache::Protected))
 	 req = &inst;
       else
 	 continue;
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index ed817934b..9848ac1b0 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -492,6 +492,7 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg, int const Depth)
 	   P.end() == false; P = Pkg.Group().NextPkg(P))
       {
 	 if (Pkg == P || List->IsFlag(P,pkgOrderList::Configured) == true ||
+	     List->IsFlag(P,pkgOrderList::UnPacked) == false ||
 	     Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
 	      (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
 	    continue;
@@ -877,6 +878,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
 	   P.end() == false; P = Pkg.Group().NextPkg(P))
       {
 	 if (P->CurrentVer != 0 || P == Pkg || List->IsFlag(P,pkgOrderList::UnPacked) == true ||
+	     List->IsFlag(P,pkgOrderList::Configured) == true ||
 	     Cache[P].InstallVer == 0 || (P.CurrentVer() == Cache[P].InstallVer &&
 	      (Cache[Pkg].iFlags & pkgDepCache::ReInstall) != pkgDepCache::ReInstall))
 	    continue;
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 9acb7da72..1de33ff9b 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -238,7 +238,7 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
 // ---------------------------------------------------------------------
 /* Returns 0 on error, pointer to the package otherwise */
 pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) {
-	if (MultiArchCache() == false) {
+	if (MultiArchCache() == false && Arch != "none") {
 		if (Arch == "native" || Arch == "all" || Arch == "any" ||
 		    Arch == NativeArch())
 			return SingleArchFindPkg(Name);
@@ -376,6 +376,10 @@ pkgCache::PkgIterator pkgCache::GrpIterator::FindPreferredPkg(bool const &Prefer
 		if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0))
 			return Pkg;
 	}
+	// packages without an architecture
+	Pkg = FindPkg("none");
+	if (Pkg.end() == false && (PreferNonVirtual == false || Pkg->VersionList != 0))
+		return Pkg;
 
 	if (PreferNonVirtual == true)
 		return FindPreferredPkg(false);
@@ -686,8 +690,29 @@ void pkgCache::DepIterator::GlobOr(DepIterator &Start,DepIterator &End)
    on virtual packages. */
 bool pkgCache::DepIterator::IsIgnorable(PkgIterator const &Pkg) const
 {
-   if (ParentPkg() == TargetPkg())
-      return IsNegative();
+   if (IsNegative() == false)
+      return false;
+
+   pkgCache::PkgIterator PP = ParentPkg();
+   pkgCache::PkgIterator PT = TargetPkg();
+   if (PP->Group != PT->Group)
+      return false;
+   // self-conflict
+   if (PP == PT)
+      return true;
+   pkgCache::VerIterator PV = ParentVer();
+   // ignore group-conflict on a M-A:same package - but not our implicit dependencies
+   // so that we can have M-A:same packages conflicting with their own real name
+   if ((PV->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
+   {
+      // Replaces: ${self}:other ( << ${binary:Version})
+      if (S->Type == pkgCache::Dep::Replaces && S->CompareOp == pkgCache::Dep::Less && strcmp(PV.VerStr(), TargetVer()) == 0)
+	 return false;
+      // Breaks: ${self}:other (!= ${binary:Version})
+      if (S->Type == pkgCache::Dep::DpkgBreaks && S->CompareOp == pkgCache::Dep::NotEquals && strcmp(PV.VerStr(), TargetVer()) == 0)
+	 return false;
+      return true;
+   }
 
    return false;
 }
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 67018f057..373f6625c 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -69,7 +69,9 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
       *Cache.HeaderP = pkgCache::Header();
       map_ptrloc const idxVerSysName = WriteStringInMap(_system->VS->Label);
       Cache.HeaderP->VerSysName = idxVerSysName;
-      map_ptrloc const idxArchitecture = WriteStringInMap(_config->Find("APT::Architecture"));
+      // this pointer is set in ReMap, but we need it now for WriteUniqString
+      Cache.StringItemP = (pkgCache::StringItem *)Map.Data();
+      map_ptrloc const idxArchitecture = WriteUniqString(_config->Find("APT::Architecture"));
       Cache.HeaderP->Architecture = idxArchitecture;
       if (unlikely(idxVerSysName == 0 || idxArchitecture == 0))
 	 return;
@@ -195,12 +197,27 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       string const Version = List.Version();
       if (Version.empty() == true && Arch.empty() == true)
       {
+	 // package descriptions
 	 if (MergeListGroup(List, PackageName) == false)
 	    return false;
+	 continue;
       }
 
       if (Arch.empty() == true)
-	 Arch = _config->Find("APT::Architecture");
+      {
+	 // use the pseudo arch 'none' for arch-less packages
+	 Arch = "none";
+	 /* We might built a SingleArchCache here, which we don't want to blow up
+	    just for these :none packages to a proper MultiArchCache, so just ensure
+	    that we have always a native package structure first for SingleArch */
+	 pkgCache::PkgIterator NP;
+	 Dynamic<pkgCache::PkgIterator> DynPkg(NP);
+	 if (NewPackage(NP, PackageName, _config->Find("APT::Architecture")) == false)
+	 // TRANSLATOR: The first placeholder is a package name,
+	 // the other two should be copied verbatim as they include debug info
+	 return _error->Error(_("Error occurred while processing %s (%s%d)"),
+			      PackageName.c_str(), "NewPackage", 0);
+      }
 
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
@@ -418,6 +435,43 @@ bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator
 	       return _error->Error(_("Error occurred while processing %s (%s%d)"),
 				    Pkg.Name(), "AddImplicitDepends", 1);
       }
+      /* :none packages are packages without an architecture. They are forbidden by
+	 debian-policy, so usually they will only be in (old) dpkg status files -
+	 and dpkg will complain about them - and are pretty rare. We therefore do
+	 usually not create conflicts while the parent is created, but only if a :none
+	 package (= the target) appears. This creates incorrect dependencies on :none
+	 for architecture-specific dependencies on the package we copy from, but we
+	 will ignore this bug as architecture-specific dependencies are only allowed
+	 in jessie and until then the :none packages should be extinct (hopefully).
+	 In other words: This should work long enough to allow graceful removal of
+	 these packages, it is not supposed to allow users to keep using them … */
+      if (strcmp(Pkg.Arch(), "none") == 0)
+      {
+	 pkgCache::PkgIterator M = Grp.FindPreferredPkg();
+	 if (M.end() == false && Pkg != M)
+	 {
+	    pkgCache::DepIterator D = M.RevDependsList();
+	    Dynamic<pkgCache::DepIterator> DynD(D);
+	    for (; D.end() == false; ++D)
+	    {
+	       if ((D->Type != pkgCache::Dep::Conflicts &&
+		    D->Type != pkgCache::Dep::DpkgBreaks &&
+		    D->Type != pkgCache::Dep::Replaces) ||
+		   D.ParentPkg().Group() == Grp)
+		  continue;
+
+	       map_ptrloc *OldDepLast = NULL;
+	       pkgCache::VerIterator ConVersion = D.ParentVer();
+	       Dynamic<pkgCache::VerIterator> DynV(ConVersion);
+	       // duplicate the Conflicts/Breaks/Replaces for :none arch
+	       if (D->Version == 0)
+		  NewDepends(Pkg, ConVersion, "", 0, D->Type, OldDepLast);
+	       else
+		  NewDepends(Pkg, ConVersion, D.TargetVer(),
+			     D->CompareOp, D->Type, OldDepLast);
+	    }
+	 }
+      }
    }
    if (unlikely(AddImplicitDepends(Grp, Pkg, Ver) == false))
       return _error->Error(_("Error occurred while processing %s (%s%d)"),
@@ -722,6 +776,7 @@ unsigned long pkgCacheGenerator::NewVersion(pkgCache::VerIterator &Ver,
    
    // Fill it in
    Ver = pkgCache::VerIterator(Cache,Cache.VerP + Version);
+   //Dynamic<pkgCache::VerIterator> DynV(Ver); // caller MergeListVersion already takes care of it
    Ver->NextVer = Next;
    Ver->ID = Cache.HeaderP->VersionCount++;
    map_ptrloc const idxVerStr = WriteStringInMap(VerStr);
@@ -871,6 +926,9 @@ bool pkgCacheGenerator::ListParser::NewDepends(pkgCache::VerIterator &Ver,
 
    // Locate the target package
    pkgCache::PkgIterator Pkg = Grp.FindPkg(Arch);
+   // we don't create 'none' packages and their dependencies if we can avoid it …
+   if (Pkg.end() == true && Arch == "none" && strcmp(Ver.ParentPkg().Arch(), "none") != 0)
+      return true;
    Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
    if (Pkg.end() == true) {
       if (unlikely(Owner->NewPackage(Pkg, PackageName, Arch) == false))
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index b47dab90c..4ae3b5f87 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -27,6 +27,7 @@
 
 #include <apt-pkg/policy.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/cachefilter.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
@@ -259,17 +260,33 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
    }
 
    // find the package (group) this pin applies to
-   pkgCache::GrpIterator Grp;
-   pkgCache::PkgIterator Pkg;
-   if (Arch.empty() == false)
-      Pkg = Cache->FindPkg(Name, Arch);
-   else {
-      Grp = Cache->FindGrp(Name);
-      if (Grp.end() == false)
-	 Pkg = Grp.PackageList();
+   pkgCache::GrpIterator Grp = Cache->FindGrp(Name);
+   bool matched = false;
+   if (Grp.end() == false)
+   {
+      std::string MatchingArch;
+      if (Arch.empty() == true)
+	 MatchingArch = Cache->NativeArch();
+      else
+	 MatchingArch = Arch;
+      APT::CacheFilter::PackageArchitectureMatchesSpecification pams(MatchingArch);
+      for (pkgCache::PkgIterator Pkg = Grp.PackageList(); Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
+      {
+	 if (pams(Pkg.Arch()) == false)
+	    continue;
+	 Pin *P = Pins + Pkg->ID;
+	 // the first specific stanza for a package is the ruler,
+	 // all others need to be ignored
+	 if (P->Type != pkgVersionMatch::None)
+	    P = &*Unmatched.insert(Unmatched.end(),PkgPin(Pkg.FullName()));
+	 P->Type = Type;
+	 P->Priority = Priority;
+	 P->Data = Data;
+	 matched = true;
+      }
    }
 
-   if (Pkg.end() == true)
+   if (matched == false)
    {
       PkgPin *P = &*Unmatched.insert(Unmatched.end(),PkgPin(Name));
       if (Arch.empty() == false)
@@ -279,20 +296,6 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
       P->Data = Data;
       return;
    }
-
-   for (; Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
-   {
-      Pin *P = Pins + Pkg->ID;
-      // the first specific stanza for a package is the ruler,
-      // all others need to be ignored
-      if (P->Type != pkgVersionMatch::None)
-	 P = &*Unmatched.insert(Unmatched.end(),PkgPin(Pkg.FullName()));
-      P->Type = Type;
-      P->Priority = Priority;
-      P->Data = Data;
-      if (Grp.end() == true)
-	 break;
-   }
 }
 									/*}}}*/
 // Policy::GetMatch - Get the matching version for a package pin	/*{{{*/
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index ce869581b..0a2c28d23 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -597,6 +597,7 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
    bool const Installed = _config->FindB("APT::Cache::Installed", false);
    bool const Important = _config->FindB("APT::Cache::Important", false);
    bool const ShowDepType = _config->FindB("APT::Cache::ShowDependencyType", RevDepends == false);
+   bool const ShowVersion = _config->FindB("APT::Cache::ShowVersion", false);
    bool const ShowPreDepends = _config->FindB("APT::Cache::ShowPre-Depends", true);
    bool const ShowDepends = _config->FindB("APT::Cache::ShowDepends", true);
    bool const ShowRecommends = _config->FindB("APT::Cache::ShowRecommends", Important == false);
@@ -646,10 +647,13 @@ bool ShowDepends(CommandLine &CmdL, bool const RevDepends)
 		if (ShowDepType == true)
 		  cout << D.DepType() << ": ";
 		if (Trg->VersionList == 0)
-		  cout << "<" << Trg.FullName(true) << ">" << endl;
+		  cout << "<" << Trg.FullName(true) << ">";
 		else
-		  cout << Trg.FullName(true) << endl;
-	    
+		  cout << Trg.FullName(true);
+		if (ShowVersion == true && D->Version != 0)
+		   cout << " (" << pkgCache::CompTypeDeb(D->CompareOp) << ' ' << D.TargetVer() << ')';
+		cout << std::endl;
+
 		if (Recurse == true && Shown[Trg->ID] == false)
 		{
 		  Shown[Trg->ID] = true;
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 4bbe0c492..ede5ed6d3 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1255,7 +1255,9 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    {
       if (_config->FindB("APT::Get::Trivial-Only",false) == true)
 	 return _error->Error(_("Trivial Only specified but this is not a trivial operation."));
-      
+
+      // TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+      //             careful with hard to type or special characters (like non-breaking spaces)
       const char *Prompt = _("Yes, do as I say!");
       ioprintf(c2out,
 	       _("You are about to do something potentially harmful.\n"
@@ -2941,7 +2943,7 @@ bool DoBuildDep(CommandLine &CmdL)
 	       for (; Ver != verlist.end(); ++Ver)
 	       {
 		  forbidden.clear();
-		  if (Ver->MultiArch == pkgCache::Version::None)
+		  if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
 		  {
 		     if (colon == string::npos)
 			Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
diff --git a/configure.in b/configure.in
index b83326e24..a5a2347c0 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)
 
 PACKAGE="apt"
-PACKAGE_VERSION="0.9.7.5ubuntu5"
+PACKAGE_VERSION="0.9.7.6"
 PACKAGE_MAIL="APT Development Team <deity@lists.debian.org>"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION")
diff --git a/debian/changelog b/debian/changelog
index 7eb7563a9..37fa5977b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,59 @@
+apt (0.9.7.6ubuntu1) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * merged from debian-sid
+  
+  [ Program translation updates ]
+  * Catalan (Jordi Mallach)
+  * Drop a confusing non-breaking space. Closes: #691024
+  * Thai (Theppitak Karoonboonyanan). Closes: #691613
+
+  [ David Kalnischkies ]
+  * apt-pkg/packagemanager.cc:
+    - do not do lock-step configuration for a M-A:same package if it isn't
+      unpacked yet in SmartConfigure and do not unpack a M-A:same package
+      again in SmartUnPack if we have already configured it (LP: #1062503)
+
+ -- Jordi Mallach <jordi@debian.org>  Thu, 18 Oct 2012 23:30:46 +0200
+
+apt (0.9.7.6) unstable; urgency=low
+
+  [ Program translation updates ]
+  * Ukrainian (A. Bondarenko)
+
+  [ David Kalnischkies ]
+  * apt-pkg/pkgcachegen.cc:
+    - ensure that dependencies for packages:none are always generated
+    - add 2 missing remap registrations causing a segfault in case
+      we use the not remapped iterators after a move of the mmap again
+    - write the native architecture as unique string into the cache header
+      as it is used for arch:all packages as a map to arch:native.
+      Otherwise arch comparisons later will see differences (Closes: #689323)
+  * apt-pkg/pkgcache.cc:
+    - ignore negative dependencies applying in the same group for M-A:same
+      packages on the real package name as self-conflicts (Closes: #688863)
+  * cmdline/apt-cache.cc:
+    - print versioned dependency relations in (r)depends if the option
+      APT::Cache::ShowVersion is true (default: false) as discussed in
+      #218995 to help debian-cd fixing #687949. Thanks to Sam Lidder
+      for initial patch and Steve McIntyre for nagging and testing!
+  * apt-pkg/edsp.cc:
+    - include reinstall requests and already installed (= protected) packages
+      in the install-request for external resolvers (Closes: #689331)
+  * apt-pkg/policy.cc:
+    - match pins with(out) an architecture as we do on the commandline
+      (partly fixing #687255, b= support has to wait for jessie)
+  * apt-pkg/contrib/netrc.cc:
+    - remove the 64 char limit for login/password in internal usage
+    - remove 256 char line limit by using getline() (POSIX.1-2008)
+  
+  [ Colin Watson ]
+  * apt-pkg/pkgcachegen.cc:
+    - Fix crash if the cache is remapped while writing a Provides version
+      (LP: #1066445).
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 16 Oct 2012 18:08:53 +0200
+
 apt (0.9.7.5ubuntu5) quantal; urgency=low
 
   * Revert "missing remap registration" change from 0.9.7.5ubuntu4; this
@@ -85,7 +141,7 @@ apt (0.9.7.5ubuntu1) quantal; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Aug 2012 12:06:48 +0200
 
-apt (0.9.7.5) UNRELEASED; urgency=low
+apt (0.9.7.5) unstable; urgency=low
 
   [ Manpages translation updates ]
   * Japanese (KURASAWA Nozomu) (Closes: #684435)
@@ -115,8 +171,16 @@ apt (0.9.7.5) UNRELEASED; urgency=low
     - do not warn about files which have a record in the Release file, but
       are not present on the CD to mirror the behavior of the other methods
       and to allow uncompressed indexes to be dropped without scaring users
+    - do not create duplicated flat-archive CD-ROM sources for foreign
+      architectures on multi-arch CD-ROMs
+    - do not warn about files which have a record in the Release file, but
+      are not present on the CD to mirror the behavior of the other methods
+      and to allow uncompressed indexes to be dropped without scaring users
+  * apt-pkg/pkgcachegen.cc:
+    - do not create 'native' (or now 'none') package structures as a side
+      effect of description translation parsing as it pollutes the cache
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 26 Aug 2012 10:49:17 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 11 Sep 2012 15:56:44 +0200
 
 apt (0.9.7.4) unstable; urgency=low
 
@@ -1042,10 +1106,10 @@ apt (0.8.16~exp10) experimental; urgency=low
   * apt-pkg/contrib/fileutl.h:
     - store the offset in the internal fd before calculate size of
       the zlib-handled file to jump back to this place again
-  [ David Kalnischkies ]
-  [ Michael Vogt ]
-  * apt-pkg/contrib/fileutl.h:
-    - fix segfault triggered by the python-apt testsuite
+  * apt-pkg/aptconfiguration.cc:
+    - parse dpkg --print-foreign-architectures correctly in
+      case archs are separated by newline instead of space, too.
+      (Closes: #655590)
 
   [ Michael Vogt ]
   * apt-pkg/contrib/fileutl.h:
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index f1f101ef3..6945c8d34 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -213,7 +213,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.7.5ubuntu5">
+<!ENTITY apt-product-version "0.9.7.6">
 
 <!-- Codenames for debian releases -->
 <!ENTITY oldstable-codename "squeeze">
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 38ffefe49..da1af2149 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -2,20 +2,20 @@
 # Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
 #
-# Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010.
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.8.0~pre1\n"
+"Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-08-30 12:50+0300\n"
-"PO-Revision-Date: 2010-08-25 23:07+0100\n"
+"POT-Creation-Date: 2012-08-30 22:07+0300\n"
+"PO-Revision-Date: 2012-09-03 01:53+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language-Team: Portuguese <l10n@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "<!ENTITY apt-author.team \"\n"
 "   <author>\n"
-"    <othername>APT team</othername>\n"
+"    <othername>Equipa do APT</othername>\n"
 "    <contrib></contrib>\n"
 "   </author>\n"
 "\">\n"
@@ -276,13 +276,7 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent:109
-#, fuzzy, no-wrap
-#| msgid ""
-#| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
-#| "     <listitem><para>Storage area for package files in transit.\n"
-#| "     Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
-#| "     </varlistentry>\n"
-#| "\">\n"
+#, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
@@ -292,7 +286,7 @@ msgid ""
 msgstr ""
 "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 "     <listitem><para>Área de armazenamento para ficheiros de pacotes em curso.\n"
-"     Item de Configuração: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
+"     Item de Configuração: <literal>Dir::Cache::Archives</literal> será implicitamente acrescentado (<filename>partial</filename>)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -388,13 +382,7 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent:150
-#, fuzzy, no-wrap
-#| msgid ""
-#| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
-#| "     <listitem><para>Storage area for state information in transit.\n"
-#| "     Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
-#| "     </varlistentry>\n"
-#| "\">\n"
+#, no-wrap
 msgid ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Storage area for state information in transit.\n"
@@ -404,7 +392,7 @@ msgid ""
 msgstr ""
 "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 "     <listitem><para>Área de armazenamento para informação de estado em trânsito.\n"
-"     Item de Configuração: <literal>Dir::State::Lists</literal> (parcial implícito).</para></listitem>\n"
+"     Item de Configuração: <literal>Dir::State::Lists</literal> será implicitamente acrescentado (<filename>partial</filename>)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -469,7 +457,10 @@ msgid ""
 "<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
 "     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
 "<!ENTITY translation-title \"TRANSLATION\">\n"
-msgstr "<!ENTITY translation-title \"TRADUÇÃO\">\n"
+msgstr ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"TRADUÇÂO\">\n"
 
 #. type: Plain text
 #: apt.ent:184
@@ -485,7 +476,7 @@ msgid ""
 "\">\n"
 msgstr ""
 "<!ENTITY translation-holder \"\n"
-"     A tradução Portuguesa foi feita por Américo Monteiro <email>a_monteiro@netcabo.pt</email> em 2009, 2010.\n"
+"     A tradução Portuguesa foi feita por Américo Monteiro <email>a_monteiro@netcabo.pt</email> de 2009 a 2012.\n"
 "     A tradução foi revista pela equipa de traduções portuguesas da Debian <email>traduz@debianpt.org</email>.\n"
 "\">\n"
 
@@ -504,6 +495,11 @@ msgid ""
 "     translation is lagging behind the original content.\n"
 "\">\n"
 msgstr ""
+"<!-- TRANSLATOR: É permitido que uma tradução tenha 20% de strings não traduzidas/aproximadas\n"
+"     num manual publicado os parágrafos novos/modificados irão talvez aparecer em inglês\n"
+"     no manual gerado. Isto está aqui para dizer ao leitor que isto não\n"
+"     é um erro do tradutor - obviamente o objectivo é que pelo menos para as versões estáveis\n"
+"     esta declaração não é necessária. :) -->\n"
 "<!ENTITY translation-english \"\n"
 "     Note que este documento traduzido pode conter partes não traduzidas.\n"
 "     Isto é feito propositadamente, para evitar perdas de conteúdo quando a\n"
@@ -516,6 +512,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como -o=config_string ex. -o=Debug::"
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 
 #. type: Plain text
 #: apt.ent:201
@@ -523,6 +521,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como -c=config_file ex. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"ficheiro_de_configuração\">"
 
 #. type: Plain text
 #: apt.ent:204
@@ -531,6 +531,9 @@ msgid ""
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como -t=target_release ou pkg/target_release ex. -"
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release \"lançamento-"
+"alvo\">"
 
 #. type: Plain text
 #: apt.ent:207
@@ -538,6 +541,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como -a=architecture ex. -a=armel --> <!ENTITY "
+"synopsis-architecture \"arquitectura\">"
 
 #. type: Plain text
 #: apt.ent:210
@@ -545,6 +550,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como apt-get install pkg ex. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
 
 #. type: Plain text
 #: apt.ent:213
@@ -552,6 +559,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como pkg=pkg_version_number ex. apt=0.8.15 --> <!"
+"ENTITY synopsis-pkg-ver-number \"número_de_versão_do_pacote\">"
 
 #. type: Plain text
 #: apt.ent:216
@@ -559,6 +568,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como apt-cache pkgnames prefix ex. apt-cache pkgnames "
+"apt --> <!ENTITY synopsis-prefix \"prefixo\">"
 
 #. type: Plain text
 #: apt.ent:219
@@ -566,6 +577,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como apt-cache search regex ex. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
 
 #. type: Plain text
 #: apt.ent:222
@@ -573,6 +586,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como apt-cdrom -d=cdrom_mount_point ex. apt-cdrom -d=/"
+"media/cdrom --> <!ENTITY synopsis-cdrom-mount \"ponto_de_montagem-do_cdrom\">"
 
 #. type: Plain text
 #: apt.ent:225
@@ -581,6 +596,9 @@ msgid ""
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
 "\"temporary_directory\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como apt-extracttemplates -t=temporary_directory ex. "
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"directório_temporário\">"
 
 #. type: Plain text
 #: apt.ent:228
@@ -588,6 +606,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"nome_do_ficheiro\">"
 
 #. type: Plain text
 #: apt.ent:231
@@ -595,6 +615,9 @@ msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"caminho"
+"\">"
 
 #. type: Plain text
 #: apt.ent:234
@@ -603,6 +626,9 @@ msgid ""
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
 "\"override-file\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-override "
+"\"ficheiro_de_sobreposição\">"
 
 #. type: Plain text
 #: apt.ent:237
@@ -611,6 +637,9 @@ msgid ""
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
 "\"pathprefix\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+"\"prefixo_de_caminho\">"
 
 #. type: Plain text
 #: apt.ent:240
@@ -618,6 +647,8 @@ msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
+"generate section --> <!ENTITY synopsis-section \"secção\">"
 
 #. type: Plain text
 #: apt.ent:243
@@ -625,6 +656,8 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
 msgstr ""
+"<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-key "
+"export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-get.8.xml:26 apt-cache.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26
@@ -920,14 +953,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:172
-#, fuzzy
-#| msgid ""
-#| "Source packages are tracked separately from binary packages via "
-#| "<literal>deb-src</literal> type lines in the &sources-list; file. This "
-#| "means that you will need to add such a line for each repository you want "
-#| "to get sources from. If you don't do this you will probably get another "
-#| "(newer, older or none) source version than the one you have installed or "
-#| "could install."
 msgid ""
 "Source packages are tracked separately from binary packages via <literal>deb-"
 "src</literal> lines in the &sources-list; file. This means that you will "
@@ -935,21 +960,14 @@ msgid ""
 "otherwise you will probably get either the wrong (too old/too new) source "
 "versions or none at all."
 msgstr ""
-"Os pacotes fonte são acompanhados em separado dos pacotes binários via linha "
-"do tipo <literal>deb-src</literal> no ficheiro &sources-list;. Isto quer "
-"dizer que você precisa de adicionar tal linha para cada repositório de onde "
-"deseja obter fontes. Se você não fizer isto, irá provavelmente obter outra "
-"versão de fonte (mais recente, antiga ou nenhuma) que aquela que tem "
-"instalada ou pode instalar."
+"Os pacotes fonte são acompanhados em separado dos pacotes binários via "
+"linhas <literal>deb- src</literal> no ficheiro &sources-list;. Isto quer "
+"dizer que você precisa de adicionar uma dessas linhas para cada repositório "
+"de onde deseja obter fontes; caso contrário, irá provavelmente obter versões "
+"de fonte erradas (muito antigas/muito novas) ou mesmo nenhuma."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:178
-#, fuzzy
-#| msgid ""
-#| "If the <option>--compile</option> option is specified then the package "
-#| "will be compiled to a binary .deb using <command>dpkg-buildpackage</"
-#| "command>, if <option>--download-only</option> is specified then the "
-#| "source package will not be unpacked."
 msgid ""
 "If the <option>--compile</option> option is specified then the package will "
 "be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -959,8 +977,9 @@ msgid ""
 msgstr ""
 "Se for especificada a opção <option>--compile</option> então o pacote irá "
 "ser compilado para um binário .deb usando <command>dpkg-buildpackage</"
-"command>, Se for especificado <option>--download-only</option> então o "
-"pacote fonte não será desempacotado."
+"command> para a arquitectura definida pela opção <command>--host-"
+"architecture</command>. Se for especificado <option>--download-only</option> "
+"então o pacote fonte não será desempacotado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:185
@@ -979,26 +998,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:191
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "Note that source packages are not installed and tracked in the "
 "<command>dpkg</command> database like binary packages; they are simply "
 "downloaded to the current directory, like source tarballs."
 msgstr ""
-"Note que os pacotes fonte não são acompanhados como pacotes binários, eles "
-"existem apenas no directório actual e são semelhantes à descarga de tar "
-"balls fonte."
+"Note que os pacotes fonte não são instalados e acompanhados na base de dados "
+"do <command>dpkg</command> como os pacotes binários; eles são simplesmente "
+"descarregados para o directório actual, como tarballs fonte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:197
-#, fuzzy
-#| msgid ""
-#| "<literal>build-dep</literal> causes apt-get to install/remove packages in "
-#| "an attempt to satisfy the build dependencies for a source package."
 msgid ""
 "<literal>build-dep</literal> causes apt-get to install/remove packages in an "
 "attempt to satisfy the build dependencies for a source package. By default "
@@ -1007,7 +1017,10 @@ msgid ""
 "option> option instead."
 msgstr ""
 "<literal>build-dep</literal> faz o apt-get instalar/remover pacotes numa "
-"tentativa de satisfazer dependências de compilação para um pacote fonte."
+"tentativa de satisfazer dependências de compilação para um pacote fonte. Por "
+"predefinição, as dependências são satisfeitas para compilar o pacote "
+"nativamente. Se desejado, em vez disso, pode ser especificada uma "
+"arquitectura-anfitriã com a opção <option>--host-architecture</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:204
@@ -1024,6 +1037,8 @@ msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directory."
 msgstr ""
+"<literal>download</literal> irá descarregar o pacote binário dado para o "
+"directório actual."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:215
@@ -1065,18 +1080,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:235
-#, fuzzy
-#| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
 msgid ""
 "<literal>autoremove</literal> is used to remove packages that were "
 "automatically installed to satisfy dependencies for other packages and are "
 "now no longer needed."
 msgstr ""
 "<literal>autoremove</literal> é usado para remover pacotes que foram "
-"instalados automaticamente para satisfazer dependências de algum pacote e "
+"instalados automaticamente para satisfazer dependências de outros pacotes e "
 "que já não são necessários."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1092,6 +1102,15 @@ msgid ""
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
+"<literal>changelog</literal> descarrega o registo de alterações de um pacote "
+"e mostra-o através do <command>sensible-pager</command>. O nome do servidor "
+"e directório base são definidos na variável <literal>APT::Changelogs::"
+"Server</literal> (ex. <ulink url=\"http://packages.debian.org/changelogs"
+"\">packages.debian.org/changelogs</ulink> para Debian ou <ulink url=\"http://"
+"changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
+"para Ubuntu). Por predefinição mostra o registo de alterações da versão que "
+"está instalada. No entanto, você pode especificar as mesmas opções que são "
+"para o comando <option>install</option>."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-get.8.xml:258 apt-cache.8.xml:248 apt-mark.8.xml:108
@@ -1111,16 +1130,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:268
-#, fuzzy
-#| msgid ""
-#| "Do not consider recommended packages as a dependency for installing.  "
-#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
-"Não considera pacotes recomendados como dependências para instalação. Item "
-"de Configuração: <literal>APT::Install-Recommends</literal>."
+"Considera pacotes sugeridos como uma dependência para instalação. Item de "
+"Configuração: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:273
@@ -1223,15 +1238,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:330
-#, fuzzy
-#| msgid ""
-#| "Simulation run as user will deactivate locking (<literal>Debug::"
-#| "NoLocking</literal>)  automatic. Also a notice will be displayed "
-#| "indicating that this is only a simulation, if the option <literal>APT::"
-#| "Get::Show-User-Simulation-Note</literal> is set (Default: true).  Neither "
-#| "NoLocking nor the notice will be triggered if run as root (root should "
-#| "know what he is doing without further warnings by <literal>apt-get</"
-#| "literal>)."
 msgid ""
 "Simulated runs performed as a user will automatically deactivate locking "
 "(<literal>Debug::NoLocking</literal>), and if the option <literal>APT::Get::"
@@ -1241,22 +1247,16 @@ msgid ""
 "should know what they are doing without further warnings from <literal>apt-"
 "get</literal>."
 msgstr ""
-"Uma simulação corrida como utilizador irá automaticamente desactivar o "
-"bloqueio (<literal>Debug::NoLocking</literal>). Também será mostrado um "
-"aviso indicando que é apenas uma simulação, se a opção <literal>APT::Get::"
-"Show-User-Simulation-Note</literal> estiver definida (a predefinição é "
-"verdadeira). Nem o NoLocking nem o aviso serão activados se corrido como "
-"root (o root deve saber o que está a fazer sem mais avisos do <literal>apt-"
-"get</literal>)."
+"As simulações executadas como um utilizador irão desactivar automaticamente "
+"o bloqueio (<literal>Debug::NoLocking</literal>), e se a opção <literal>APT::"
+"Get::Show-User-Simulation-Note</literal> estiver definida (como está por "
+"predefinição) será também mostrado um aviso indicando que é apenas uma "
+"simulação. As execuções executadas pelo root não accionam nem o NoLocking "
+"nem o aviso - os super-utilizadores devem saber o que estão a fazer sem mais "
+"avisos do <literal>apt-get</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:338
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
 msgid ""
 "Simulated runs print out a series of lines, each representing a "
 "<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1264,10 +1264,11 @@ msgid ""
 "Square brackets indicate broken packages, and empty square brackets indicate "
 "breaks that are of no consequence (rare)."
 msgstr ""
-"A simulação escreve uma série de linhas cada uma representando uma operação "
-"do dpkg, Configurar (Conf), Remover (Remv), Desempacotar (Inst). Parênteses "
-"rectos ([]) indicam pacotes quebrados e conjuntos de parênteses rectos "
-"vazios significam quebras que não têm consequência (raro)."
+"As simulações escrevem uma série de linhas cada uma representando uma "
+"operação do <command>dpkg</command>: configurar (<literal>Conf</literal>), "
+"remover (<literal>Remv</literal>) ou desempacotar (<literal>Inst</literal>). "
+"Parêntesis rectos ([]) indicam pacotes quebrados e parêntesis rectos vazios "
+"indicam quebras que não têm consequência (raro)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:346
@@ -1287,16 +1288,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:354
-#, fuzzy
-#| msgid ""
-#| "Compile source packages after downloading them.  Configuration Item: "
-#| "<literal>APT::Get::Compile</literal>."
 msgid ""
 "Automatic \"no\" to all prompts.  Configuration Item: <literal>APT::Get::"
 "Assume-No</literal>."
 msgstr ""
-"Compila pacotes fonte após os descarregar. Item de Configuração: "
-"<literal>APT::Get::Compile</literal>."
+"Resposta \"Não\" automática a todos os avisos. Item de Configuração: "
+"<literal>APT::Get::Assume-No</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:359
@@ -1327,6 +1324,12 @@ msgid ""
 "Architecture</literal>).  Configuration Item: <literal>APT::Get::Host-"
 "Architecture</literal>"
 msgstr ""
+"Esta opção controla a arquitectura para que os pacotes são compilados pelo "
+"<command>apt-get source --compile</command> e como as dependências cruzadas "
+"de compilação são satisfeitas. Por predefinição não está activa o que "
+"significa que a arquitectura anfitriã é a mesma que a arquitectura de "
+"compilação (a qual é definida por <literal>APT::Architecture</literal>).  "
+"item de Configuração: <literal>APT::Get::Host-Architecture</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:381
@@ -1365,22 +1368,16 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:400
-#, fuzzy
-#| msgid ""
-#| "Do not install new packages; when used in conjunction with "
-#| "<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
-#| "packages on the command line from being upgraded if they are not already "
-#| "installed.  Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgid ""
 "Do not install new packages; when used in conjunction with <literal>install</"
 "literal>, <literal>only-upgrade</literal> will install upgrades for already "
 "installed packages only and ignore requests to install new packages.  "
 "Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
 msgstr ""
-"Não instala pacotes novos; Quando usado em conjunto com <literal>install</"
-"literal>, o <literal>only-upgrade</literal> irá prevenir que pacotes sejam "
-"actualizados na linha de comandos se estes não estiverem já instalados. Item "
-"de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
+"Não instala pacotes novos; quando usado em conjunto com <literal>install</"
+"literal>, <literal>only-upgrade</literal> irá instalar apenas actualizações "
+"para pacotes já instalados e ignorar pedidos para instalar novos pacotes. "
+"Item de Configuração: <literal>APT::Get::Only-Upgrade</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:408
@@ -1442,14 +1439,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:440
-#, fuzzy
-#| msgid ""
-#| "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>."
 msgid ""
 "This option is on by default; use <literal>--no-list-cleanup</literal> to "
 "turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1458,7 +1447,7 @@ msgid ""
 "frequently change your sources list.  Configuration Item: <literal>APT::Get::"
 "List-Cleanup</literal>."
 msgstr ""
-"A predefinição desta opção é ligada, use <literal>--no-list-cleanup</"
+"Esta opção está ligada por predefinição; use <literal>--no-list-cleanup</"
 "literal> para a desligar. Quando ligada o <command>apt-get</command> irá "
 "gerir automaticamente os conteúdos de <filename>&statedir;/lists</filename> "
 "para assegurar que os ficheiros obsoletos são apagados. A única razão para "
@@ -1620,7 +1609,7 @@ msgstr ""
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cache.8.xml:33
 msgid "query the APT cache"
-msgstr ""
+msgstr "pesquisa a cache do APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cache.8.xml:39
@@ -1641,13 +1630,16 @@ msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
+"<literal>gencaches</literal> cria a cache de pacotes do APT. Isto é feito "
+"implicitamente por todos os comandos que precisam desta cache se esta "
+"estiver em falta ou desactualizada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
 #: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
 #: apt-cache.8.xml:224 apt-cache.8.xml:236
 msgid "&synopsis-pkg;"
-msgstr ""
+msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -1810,13 +1802,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #: apt-cache.8.xml:128
-#, fuzzy
-#| msgid ""
-#| "<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."
 msgid ""
 "<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 "
@@ -1826,8 +1811,8 @@ msgid ""
 msgstr ""
 "<literal>Total distinct versions</literal> é o número de versões de pacotes "
 "encontrados na cache; este valor é portanto pelo menos igual ao número do "
-"total de nomes de pacotes. Se mais do que uma distribuição (ambas \"stable\" "
-"e \"unstable\", por exemplo) está a ser acedida, este valor pode ser "
+"total de nomes de pacotes. Se for acedida a mais do que uma distribuição "
+"(por exemplo \"stable\" e \"unstable\"), este valor pode ser "
 "consideravelmente maior que o número do total de nomes de pacotes."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -1841,11 +1826,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
-#, fuzzy
-#| msgid ""
-#| "<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."
 msgid ""
 "<literal>showsrc</literal> displays all the source package records that "
 "match the given package names. All versions are shown, as well as all "
@@ -1854,7 +1834,7 @@ msgstr ""
 "<literal>showsrc</literal> mostra todos os registos de pacotes fonte que "
 "correspondem aos nomes de pacotes fornecidos. Todas as versões são "
 "mostradas, assim como todos os registos que declaram o nome como sendo um "
-"Binário."
+"pacote binário."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:149
@@ -1896,22 +1876,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:169
 msgid "&synopsis-regex;"
-msgstr ""
+msgstr "&synopsis-regex;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
-#, fuzzy
-#| msgid ""
-#| "<literal>search</literal> performs a full text search on all available "
-#| "package lists for the POSIX regex pattern given, see "
-#| "<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-#| "<manvolnum>7</manvolnum></citerefentry>.  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, including virtual "
-#| "package names.  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."
 msgid ""
 "<literal>search</literal> performs a full text search on all available "
 "package lists for the POSIX regex pattern given, see &regex;.  It searches "
@@ -1924,14 +1892,12 @@ msgid ""
 msgstr ""
 "<literal>search</literal> executa uma busca de texto completo em todas as "
 "listas de pacotes disponíveis para o padrão POSIX regex fornecido, veja "
-"<citerefentry><refentrytitle><command>regex</command></refentrytitle> "
-"<manvolnum>7</manvolnum></citerefentry>. Procura nos nomes de pacotes e nas "
-"descrições por uma ocorrência da expressão regular e escreve o nome do "
-"pacote e a descrição curta, incluindo nomes de pacotes virtuais. Se for "
-"fornecido <option>--full</option> então são produzidos resultados idênticos "
-"ao <literal>show</literal> para cada pacote correspondente, e se for "
-"fornecido <option>--names-only</option> então não há procura na descrição "
-"longa, apenas no nome do pacote."
+"&regex;. Procura nos nomes de pacotes e nas descrições por uma ocorrência da "
+"expressão regular e escreve o nome do pacote e a descrição curta, incluindo "
+"nomes de pacotes virtuais. Se for fornecido <option>--full</option> então "
+"são produzidos resultados idênticos ao <literal>show</literal> para cada "
+"pacote correspondente, e se for fornecido <option>--names-only</option> "
+"então não há procura na descrição longa, apenas no nome do pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:181
@@ -2015,12 +1981,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:216
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "The resulting nodes will have several shapes; normal packages are boxes, "
 "pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -2028,10 +1988,10 @@ msgid ""
 "packages), blue lines are pre-depends, green lines are conflicts."
 msgstr ""
 "Os nós resultantes irão ter várias formas; pacotes normais são caixas, "
-"fornecimentos puros são triângulos, fornecimentos mistos são diamantes, "
-"pacotes desaparecidos são hexágonos. Caixas cor de laranja significa que a "
-"recursão parou [pacotes leaf], linhas azuis são pré-dependências, linhas "
-"verdes são conflitos."
+"pacotes virtuais puros são triângulos, pacotes virtuais de mistura são "
+"diamantes, pacotes desaparecidos são hexágonos. Caixas cor de laranja "
+"significam que a recursão parou (pacotes leaf), linhas azuis são pré-"
+"dependências, linhas verdes são conflitos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:221
@@ -2141,13 +2101,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:288
-#, fuzzy
-#| msgid ""
-#| "Per default the <literal>depends</literal> and <literal>rdepends</"
-#| "literal> print all dependencies. This can be twicked with these flags "
-#| "which will omit the specified dependency type.  Configuration Item: "
-#| "<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></"
-#| "literal> e.g. <literal>APT::Cache::ShowRecommends</literal>."
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
 "print all dependencies. This can be tweaked with these flags which will omit "
@@ -2156,10 +2109,10 @@ msgid ""
 "Cache::ShowRecommends</literal>."
 msgstr ""
 "Por predefinição o <literal>depends</literal> e <literal>rdepends</literal> "
-"escrevem todas as dependências. Isto pode ser afinado com estas bandeiras "
-"que irão omitir o tipo de dependência especificado. Item de Configuração: "
-"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
-"ex. <literal>APT::Cache::ShowRecommends</literal>."
+"escrevem todas as dependências. Isto pode ser \"afinado\" com estas "
+"bandeiras que irão omitir o tipo de dependência especificado. Item de "
+"Configuração: <literal>APT::Cache::Show<replaceable>DependencyType</"
+"replaceable></literal> ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:295
@@ -2278,19 +2231,14 @@ msgstr "Comandos"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:50
-#, fuzzy
-#| msgid ""
-#| "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>."
 msgid ""
 "Add a new key to the list of trusted keys.  The key is read from the "
 "filename given with the parameter &synopsis-param-filename; or if the "
 "filename is <literal>-</literal> from standard input."
 msgstr ""
-"Adiciona uma chave nova à lista de chaves de confiança. A chave é lida de "
-"<replaceable>nome de ficheiro</replaceable>, ou entrada standard se "
-"<replaceable>nome de ficheiro</replaceable> for <literal>-</literal>."
+"Adiciona uma chave nova à lista de chaves de confiança. A chave é lida a "
+"partir do nome de ficheiro dado com o parâmetro &synopsis-param-filename; ou "
+"se o nome do ficheiro for <literal>-</literal> a partir da entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:63
@@ -2332,9 +2280,13 @@ msgid ""
 "Update the local keyring with the archive keyring and remove from the local "
 "keyring the archive keys which are no longer valid.  The archive keyring is "
 "shipped in the <literal>archive-keyring</literal> package of your "
-"distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in "
-"Ubuntu."
+"distribution, e.g. the <literal>debian-archive-keyring</literal> package in "
+"Debian."
 msgstr ""
+"Actualiza o chaveiro local com o chaveiro do arquivo e remove do chaveiro "
+"local as chaves de arquivo que já não são válidas. O chaveiro do arquivo é "
+"submetido no pacote <literal>archive-keyring</literal> da sua distribuição, "
+"por exemplo o pacote <literal>debian-archive-keyring</literal> em Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:144
@@ -2346,6 +2298,13 @@ msgid ""
 "APT in Debian does not support this command, relying on <command>update</"
 "command> instead, but Ubuntu's APT does."
 msgstr ""
+"Executa uma actualização que funciona de modo semelhante ao comando "
+"<command>update</command> em cima, mas obtém o chaveiro do arquivo a partir "
+"de um URI e valida-o com uma chave mestra. Isto requer um &wget; instalado e "
+"uma compilação de APT configurada para ter um servidor de onde obter e um "
+"chaveiro mestre para validação. O APT em Debian não suporta este comando, "
+"confiando em vez disso no <command>update</command>, mas o APT do Ubuntu fá-"
+"lo."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-key.8.xml:160 apt-cdrom.8.xml:80
@@ -2363,14 +2322,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:164
-#, fuzzy
-#| msgid ""
-#| "With this option it is possible to specify a particular keyring file the "
-#| "command should operate on. The default is that a command is executed on "
-#| "the <filename>trusted.gpg</filename> file as well as on all parts in the "
-#| "<filename>trusted.gpg.d</filename> directory, though <filename>trusted."
-#| "gpg</filename> is the primary keyring which means that e.g. new keys are "
-#| "added to this one."
 msgid ""
 "With this option it is possible to specify a particular keyring file the "
 "command should operate on. The default is that a command is executed on the "
@@ -2398,33 +2349,24 @@ msgstr "Base de dados local de confiança de chaves de arquivos."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:183
-#, fuzzy
-#| msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
-msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
+msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:184
-#, fuzzy
-#| msgid "Keyring of Debian archive trusted keys."
-msgid "Keyring of Ubuntu archive trusted keys."
+msgid "Keyring of Debian archive trusted keys."
 msgstr "Chaveiro das chaves de confiança dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:187
-#, fuzzy
-#| msgid ""
-#| "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgid ""
-"<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 msgstr ""
 "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:188
-#, fuzzy
-#| msgid "Keyring of Debian archive removed trusted keys."
-msgid "Keyring of Ubuntu archive removed trusted keys."
+msgid "Keyring of Debian archive removed trusted keys."
 msgstr "Chaveiro das chaves de confiança removidas dos arquivos Debian."
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2464,35 +2406,25 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:52
-#, fuzzy
-#| msgid ""
-#| "<literal>markauto</literal> is used to mark a package as being "
-#| "automatically installed, which will cause the package to be removed when "
-#| "no more manually installed packages depend on this package."
 msgid ""
 "<literal>auto</literal> is used to mark a package as being automatically "
 "installed, which will cause the package to be removed when no more manually "
 "installed packages depend on this package."
 msgstr ""
-"<literal>markauto</literal> é usado para marcar um pacote como sendo "
-"instalado automaticamente, o que irá causar a remoção do pacote quando mais "
-"nenhum pacote instalado manualmente depender deste pacote."
+"<literal>auto</literal> é usado para marcar um pacote como sendo instalado "
+"automaticamente, o que irá causar a remoção do pacote quando mais nenhum "
+"pacote instalado manualmente depender deste pacote."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:60
-#, fuzzy
-#| msgid ""
-#| "<literal>unmarkauto</literal> is used to mark a package as being manually "
-#| "installed, which will prevent the package from being automatically "
-#| "removed if no other packages depend on it."
 msgid ""
 "<literal>manual</literal> is used to mark a package as being manually "
 "installed, which will prevent the package from being automatically removed "
 "if no other packages depend on it."
 msgstr ""
-"<literal>unmarkauto</literal> é usado para marcar um pacote como sendo "
-"instalado manualmente, o que irá prevenir que o pacote seja removido "
-"automaticamente se nenhum outro pacote depender dele."
+"<literal>manual</literal> é usado para marcar um pacote como sendo instalado "
+"manualmente, o que irá prevenir que o pacote seja removido automaticamente "
+"se nenhum outro pacote depender dele."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:68
@@ -2503,26 +2435,23 @@ msgid ""
 "selections</command> and the state is therefore maintained by &dpkg; and not "
 "affected by the <option>--file</option> option."
 msgstr ""
+"<literal>hold</literal> é usado para marcar um pacote como retido, o que vai "
+"prevenir que o pacote seja automaticamente instalado, actualizado ou "
+"removido. O comando é apenas um invólucro em redor de <command>dpkg --set-"
+"selections</command> e o estado é assim mantido pelo &dpkg; e não é afectado "
+"pela opção <option>--file</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:78
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
 msgid ""
 "<literal>unhold</literal> is used to cancel a previously set hold on a "
 "package to allow all actions again."
 msgstr ""
-"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
-"instalados automaticamente com cada pacote numa linha nova."
+"<literal>unhold</literal> é usado para cancelar um \"hold\" previamente "
+"definido num pacote para permitir de novo todas as acções."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:84
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showauto</literal> is used to print a list of automatically "
 "installed packages with each package on a new line.  All automatically "
@@ -2530,7 +2459,10 @@ msgid ""
 "given only those which are automatically installed will be shown."
 msgstr ""
 "<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
-"instalados automaticamente com cada pacote numa linha nova."
+"instalados automaticamente com cada pacote numa linha nova. Serão listados "
+"todos os pacotes instalados automaticamente se não for dado um pacote. Se "
+"forem dados pacotes então só serão mostrados aqueles que foram instalados "
+"automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:92
@@ -2539,36 +2471,30 @@ msgid ""
 "<literal>showauto</literal> except that it will print a list of manually "
 "installed packages instead."
 msgstr ""
+"<literal>showmanual</literal> pode ser usado do mesmo modo que o "
+"<literal>showauto</literal>, excepto que irá escrever uma lista dos pacotes "
+"instalados manualmente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:99
-#, fuzzy
-#| msgid ""
-#| "<literal>showauto</literal> is used to print a list of automatically "
-#| "installed packages with each package on a new line."
 msgid ""
 "<literal>showhold</literal> is used to print a list of packages on hold in "
 "the same way as for the other show commands."
 msgstr ""
-"<literal>showauto</literal> é usado para escrever uma lista dos pacotes "
-"instalados automaticamente com cada pacote numa linha nova."
+"<literal>showhold</literal> é usado para escrever uma lista dos pacotes em "
+"retenção do mesmo modo que os outros comandos show."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-mark.8.xml:115
-#, fuzzy
-#| msgid ""
-#| "Read/Write package stats from <filename><replaceable>FILENAME</"
-#| "replaceable></filename> instead of the default location, which is "
-#| "<filename>extended_status</filename> in the directory defined by the "
-#| "Configuration Item: <literal>Dir::State</literal>."
 msgid ""
 "Read/Write package stats from the filename given with the parameter "
 "&synopsis-param-filename; instead of from the default location, which is "
 "<filename>extended_status</filename> in the directory defined by the "
 "Configuration Item: <literal>Dir::State</literal>."
 msgstr ""
-"Lê/Escreve o estado de pacote a partir de &synopsis-param-filename; em vez "
-"da localização predefinida, a qual é <filename>extended_status</filename> no "
+"Lê/Escreve o estado de pacote a partir do nome de ficheiro dado com o "
+"parâmetro &synopsis-param-filename; em vez de o fazer a partir da "
+"localização predefinida, a qual é <filename>extended_status</filename> no "
 "directório definido pelo Item de Configuração: <literal>Dir::State</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
@@ -2678,15 +2604,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:102
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, and an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sums 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."
 msgid ""
 "Once the uploaded package is verified and included in the archive, the "
 "maintainer signature is stripped off, and checksums of the package are "
@@ -2697,33 +2614,27 @@ msgid ""
 "are in the Debian archive keyring available in the <package>debian-archive-"
 "keyring</package> package."
 msgstr ""
-"Após o upload, o pacote é verificado e incluído no arquivo, a assinatura do "
-"responsável é despojada, é computado um sumário MD5 do pacote e colocado no "
-"ficheiro Packages. Os sumários MD5 de todos os ficheiros pacotes são então "
-"computados e colocados no ficheiro Release. O ficheiro Release é então "
-"assinado pela chave de arquivo (a qual é criada uma vez por ano) e "
-"distribuído através do servidor FTP. Esta chave está também no chaveiro "
-"Debian."
+"Assim que o pacote submetido é verificado e incluído no arquivo, a "
+"assinatura do responsável é despojada, são computados sumários de "
+"verificação do pacote e colocado no ficheiro Packages. Os sumários de "
+"verificação de todos os ficheiros Packages são então computados e colocados "
+"no ficheiro Release. O ficheiro Release é então assinado pela chave de "
+"arquivo para este lançamento de Debian, e distribuído juntamente com os "
+"pacotes e os ficheiros Packages em mirrors de Debian. As chaves estão no "
+"chaveiro do arquivo Debian no pacote <package>debian-archive-keyring</"
+"package>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:113
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "End users can check the signature of the Release file, extract a checksum of "
 "a package from it and compare it with the checksum of the package they "
 "downloaded by hand - or rely on APT doing this automatically."
 msgstr ""
-"Qualquer utilizador final pode verificar a assinatura do ficheiro Release, "
-"extrair o sumário MD5 de um pacote a partir dele, e compará-lo com o sumário "
-"MD5 do pacote que descarregou. Antes da versão 0.6 apenas o sumário MD5 do "
-"pacote Debian descarregado era verificado. Agora são verificados ambos: o "
-"sumário MD5 e a assinatura do ficheiro Release."
+"Os utilizadores finais podem verificar a assinatura do ficheiro Release, "
+"extrair um sumario de verificação de um pacote a partir dele e compará-lo "
+"com o sumario de verificação do pacote que descarregaram manualmente - ou "
+"confiar no APT que faz isto automaticamente."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:118
@@ -2796,14 +2707,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:153
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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 "
@@ -2816,8 +2719,8 @@ msgstr ""
 "(você deve certificar-se que está a usar um canal de comunicação de "
 "confiança quando a obtém), adicioná-la com <command>apt-key</command> e "
 "depois correr <command>apt-get update</command> para que o apt possa "
-"descarregar e verificar os ficheiros <filename>Release.gpg</filename> dos "
-"arquivos que você configurou."
+"descarregar e verificar os ficheiros <filename>InRelease</filename> ou "
+"<filename>Release.gpg</filename> dos arquivos que você configurou."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:162
@@ -2846,17 +2749,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:174
-#, fuzzy
-#| msgid ""
-#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
-#| "abs -o Release.gpg Release</command>."
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
 "gpg Release</command>."
 msgstr ""
-"<emphasis>Assiná-lo</emphasis>. Você pode fazer isso ao correr <command>gpg -"
-"abs -o Release.gpg Release</command>."
+"<emphasis>Assiná-lo</emphasis>. Você pode fazer isso ao correr <command>gpg "
+"--clearsign -o InRelease Release</command> e <command>gpg -abs -o Release."
+"gpg Release</command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:178
@@ -3089,13 +2989,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
-#, fuzzy
-#| msgid ""
-#| "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:"
 msgid ""
 "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 "
@@ -3106,8 +2999,8 @@ msgstr ""
 "shell é usado para aceder à informação de configuração a partir de um script "
 "shell. É fornecido pares de argumentos, sendo o primeiro uma variável de "
 "shell e o segundo o valor de configuração a consultar. Como resultado cria "
-"uma lista de comandos de atribuições de shell para cada valor presente. Num "
-"script shell deverá ser usado como:"
+"uma lista de comandos atribuídos a shell para cada valor presente. Num "
+"script shell deverá ser usado como se segue:"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
 #: apt-config.8.xml:59
@@ -3153,11 +3046,13 @@ msgid ""
 "Include options which have an empty value. This is the default, so use --no-"
 "empty to remove them from the output."
 msgstr ""
+"Inclui opções que têm um valor vazio. Isto é a predefinição, então use --no-"
+"empty para removê-las dos resultados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-config.8.xml:95
 msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
-msgstr ""
+msgstr "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:96
@@ -3169,6 +3064,13 @@ msgid ""
 "as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
 "and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."
 msgstr ""
+"Define a saída de cada opção de configuração. &percnt;t irá ser substituído "
+"com o seu nome individual, &percnt;f com o seu nome hierárquico e &percnt;v "
+"com o seu valor. O uso de letras maiúsculas e caracteres especiais no valor "
+"será codificado para assegurar que pode, por exemplo, ser usado em segurança "
+"numa string citada como definido por RFC822. Adicionalmente &percnt;n será "
+"substituído por uma nova linha, e &percnt;N por um separador. Um &percnt; "
+"pode ser escrito ao usar &percnt;&percnt;."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-sortpkgs.1.xml:64
@@ -3188,12 +3090,12 @@ msgstr ""
 #. type: Content of: <refentry><refentryinfo><author><contrib>
 #: apt.conf.5.xml:20
 msgid "Initial documentation of Debug::*."
-msgstr ""
+msgstr "Documentação inicial do Debug::*."
 
 #. type: Content of: <refentry><refentryinfo><author><email>
 #: apt.conf.5.xml:21
 msgid "dburrows@debian.org"
-msgstr ""
+msgstr "dburrows@debian.org"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
@@ -3207,23 +3109,17 @@ msgstr "Ficheiro de configuração para o APT"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:42
-#, fuzzy
-#| msgid ""
-#| "<filename>apt.conf</filename> is the main configuration file for the APT "
-#| "suite of tools, but by far not the only place changes to options can be "
-#| "made. All tools therefore share the configuration files and also use a "
-#| "common command line parser to provide a uniform environment."
 msgid ""
 "<filename>/etc/apt/apt.conf</filename> is the main configuration file shared "
 "by all the tools in the APT suite of tools, though it is by no means the "
 "only place options can be set. The suite also shares a common command line "
 "parser to provide a uniform environment."
 msgstr ""
-"<filename>apt.conf</filename> é o ficheiro de configuração principal para a "
-"suite de ferramentas do APT, as não é o único lugar onde se podem fazer "
-"alterações às opções. Então todas as ferramentas partilham os ficheiros de "
-"configuração e também usam um analisador de linha de comandos comum para "
-"disponibilizar um ambiente uniforme."
+"<filename>/etc/apt/apt.conf</filename> é o ficheiro de configuração "
+"principal partilhado por todas as ferramentas na suite de ferramentas do "
+"APT, no entanto não é de maneira nenhuma o único local onde se pode definir "
+"opções. A suite também partilha um analisador comum de linha de comandos "
+"para disponibilizar um ambiente uniforme."
 
 #. type: Content of: <refentry><refsect1><orderedlist><para>
 #: apt.conf.5.xml:48
@@ -3245,12 +3141,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:52
-#, fuzzy
-#| msgid ""
-#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-#| "order which have no or \"<literal>conf</literal>\" as filename extension "
-#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
-#| "period (.) characters - otherwise they will be silently ignored."
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have either no or \"<literal>conf</literal>\" as filename "
@@ -3261,9 +3151,12 @@ msgid ""
 "be silently ignored."
 msgstr ""
 "todos os ficheiros em <literal>Dir::Etc::Parts</literal> em ordem ascendente "
-"alfanumérica sem extensão ou com \"<literal>conf</literal>\" como extensão "
-"do nome de ficheiro e que apenas contêm caracteres alfanuméricos, traço (-), "
-"underscore (_) e ponto (.) - caso contrário serão ignorados em silêncio."
+"alfa-numérica não têm extensão ou têm \"<literal>conf</literal>\" como "
+"extensão do nome de ficheiro e que apenas contêm caracteres alfa-numéricos, "
+"traços (-), underscores (_) e pontos (.). Caso contrário o APT irá escrever "
+"um aviso de que ignorou um ficheiro, a menos que o ficheiro corresponda a um "
+"padrão na lista de configuração de <literal>Dir::Ignore-Files-Silently</"
+"literal> - que então nesse caso será ignorado em silêncio."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:59
@@ -3304,19 +3197,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:72
-#, fuzzy
-#| msgid ""
-#| "Syntactically 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), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments.  Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal>. The trailing semicolon and the quotes are required. The "
-#| "value must be on one line, and there is no kind of string concatenation. "
-#| "It must not include inside quotes.  The behavior of the backslash \"\\\" "
-#| "and escaped characters inside a value is undefined and it should not be "
-#| "used. An option name may include alphanumerical characters and the \"/-:._"
-#| "+\" characters. A new scope can be opened with curly braces, like:"
 msgid ""
 "Syntactically the configuration language is modeled after what the ISC tools "
 "such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -3329,17 +3209,16 @@ msgid ""
 "alphanumeric characters and the characters \"/-:._+\".  A new scope can be "
 "opened with curly braces, like this:"
 msgstr ""
-"Sintacticamente a linguagem de configuração é modelada após o que as "
+"Sintácticamente a linguagem de configuração é modelada após o que as "
 "ferramentas ISC usam, como o bind e o dhcp. As linhas que começam com "
 "<literal>//</literal> são tratadas como comentários (ignoradas), assim como "
 "todo o texto entre <literal>/*</literal> e <literal>*/</literal>, tal como "
 "os comentários de C/C++. Cada linha é do formato <literal>APT::Get::Assume-"
-"Yes \"true\";</literal>. O ponto e vírgula à direita e as aspas são "
-"necessárias. O valor deve estar numa linha, e não há nenhum tipo de "
-"concatenação de string. Não pode incluir aspas interiores. O comportamento "
-"da backslash \"\\\" e caracteres de escape dentro de um valor é indefinido e "
-"não deve ser usado. Um nome de opção pode incluir caracteres alfanuméricos e "
-"os caracteres \"/-:._+\". Um novo scope pode ser aberto com chavetas, como:"
+"Yes \"true\";</literal>. As aspas e o ponto-e-vírgula final são necessários. "
+"O valor deve estar em uma linha, e não existe nenhum tipo de concatenação de "
+"string. Os valores não podem incluir barras invertidas ou aspas extras. Os "
+"nomes das opções são feitos de caracteres alfa-numéricos e os caracteres "
+"\"/-:._+\". Um novo scope pode ser aberto com chavetas, assim:"
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 #: apt.conf.5.xml:85
@@ -3361,12 +3240,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:93
-#, fuzzy
-#| msgid ""
-#| "with newlines placed to make it more readable. Lists can be created by "
-#| "opening a scope and including a single string enclosed in quotes followed "
-#| "by a semicolon. Multiple entries can be included, each separated by a "
-#| "semicolon."
 msgid ""
 "with newlines placed to make it more readable. Lists can be created by "
 "opening a scope and including a single string enclosed in quotes followed by "
@@ -3374,8 +3247,8 @@ msgid ""
 msgstr ""
 "com novas linhas colocadas para o tornar mais legível. As listas podem ser "
 "criadas ao abrir um scope e incluindo uma string única entre aspas seguida "
-"por um ponto e vírgula. Podem ser incluídas múltiplas entradas, cada uma "
-"separada por um ponto e vírgula (;)."
+"por um ponto e vírgula. Podem ser incluídas múltiplas entradas, separadas "
+"por um ponto e vírgula (;)."
 
 #. type: Content of: <refentry><refsect1><informalexample><programlisting>
 #: apt.conf.5.xml:98
@@ -3394,17 +3267,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:105
-#, fuzzy
-#| msgid ""
-#| "The names of the configuration items are not case-sensitive. So in the "
-#| "previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgid ""
 "Case is not significant in names of configuration items, so in the previous "
 "example you could use <literal>dpkg::pre-install-pkgs</literal>."
 msgstr ""
-"Os nomes dos items de configuração não são sensíveis a maiúsculas/"
-"minúsculas. Portanto no exemplo prévio você poderia usar <literal>dpkg::pre-"
-"install-pkgs</literal>."
+"Maiúsculas e minúsculas não são significativas nos nomes dos items de "
+"configuração, portanto no exemplo prévio você poderia usar <literal>dpkg::"
+"pre-install-pkgs</literal>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:108
@@ -3424,15 +3293,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:113
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> (which is "
-#| "deprecated and not supported by alternative implementations) 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 part of the "
-#| "configuration tree. The specified element and all its descendants are "
-#| "erased.  (Note that these lines also need to end with a semicolon.)"
 msgid ""
 "Two special commands are defined: <literal>#include</literal> (which is "
 "deprecated and not supported by alternative implementations) and "
@@ -3442,24 +3302,17 @@ msgid ""
 "the configuration tree. The specified element and all its descendants are "
 "erased.  (Note that these lines also need to end with a semicolon.)"
 msgstr ""
-"São permitidas duas especiais, <literal>#include</literal> (a qual está "
-"obsoleta e não é suportada por implementações alternativas) e "
+"Estão definidos dois comandos especiais, <literal>#include</literal> (a qual "
+"está obsoleto e não é suportado por implementações alternativas) e "
 "<literal>#clear</literal>: <literal>#include</literal> irá incluir o "
 "ficheiro fornecido, a menos que o nome do ficheiro termine numa barra (/), "
-"então todo o directório é incluído. <literal>#clear</literal> é usado para "
-"apagar uma parte da árvore de configuração. O elemento especificado e os "
-"seus descendentes são apagados. (Note que estas linhas também precisam de "
+"que no caso todo o directório é incluído. <literal>#clear</literal> é usado "
+"para apagar uma parte da árvore de configuração. O elemento especificado e "
+"os seus descendentes são apagados. (Note que estas linhas também precisam de "
 "acabar com um 'ponto e vírgula' (;) .)"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:123
-#, fuzzy
-#| msgid ""
-#| "The #clear command is the only way to delete a list or a complete scope.  "
-#| "Reopening a scope or the ::-style described below will <emphasis>not</"
-#| "emphasis> override previously written entries. Only options can be "
-#| "overridden by addressing a new value to it - lists and scopes can't be "
-#| "overridden, only cleared."
 msgid ""
 "The <literal>#clear</literal> command is the only way to delete a list or a "
 "complete scope. Reopening a scope (or using the syntax described below with "
@@ -3467,22 +3320,15 @@ msgid ""
 "previously written entries. Options can only be overridden by addressing a "
 "new value to them - lists and scopes can't be overridden, only cleared."
 msgstr ""
-"O comando #clear é a única maneira de apagar uma lista ou um scope completo. "
-"Reabrindo um scope ou o  ::-style descrito abaixo <emphasis>não</emphasis> "
-"irá sobrepor entradas escritas anteriormente. Apenas as opções podem ser "
+"O comando <literal>#clear</literal> é a única maneira de apagar uma lista ou "
+"um scope completo. Reabrindo um scope (ou usando a sintaxe descrita em baixo "
+"com um <literal>::</literal> acrescentado) <emphasis>não</emphasis> irá "
+"sobrepor entradas escritas anteriormente. As opções podem apenas ser "
 "sobrepostas ao atribuir um novo valor a elas - listas e scopes não podem ser "
 "sobrepostos, apenas limpos."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:131
-#, fuzzy
-#| msgid ""
-#| "All of the APT tools take an -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. (As "
-#| "you might suspect: The scope syntax can't be used on the command line.)"
 msgid ""
 "All of the APT tools take an -o option which allows an arbitrary "
 "configuration directive to be specified on the command line. The syntax is a "
@@ -3495,27 +3341,13 @@ msgstr ""
 "Todas as ferramentas do APT recebem uma opção -o que permite uma directiva "
 "de configuração arbitrária para ser especificada na linha de comandos. A "
 "sintaxe é um nome de opção completo (<literal>APT::Get::Assume-Yes</literal> "
-"por exemplo) seguido por um igual (=) e depois o valor da opção. Também pode "
-"ser acrescentadas listas ao adicionar um duplo dois-pontos (::) à direita "
-"para o nome da lista. (Como deve suspeitar: A sintaxe de scope não pode ser "
-"usada na linha de comandos.)"
+"por exemplo) seguido por um igual (=) e depois o valor da opção. Para "
+"acrescentar um novo elemento a uma lista, adicione um <literal>::</literal> "
+"ao final do nome da lista. (Como deve suspeitar, a sintaxe de scope não pode "
+"ser usada na linha de comandos.)"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:139
-#, fuzzy
-#| msgid ""
-#| "Note that you can use :: only for appending one item per line to a list "
-#| "and that you should not use it in combination with the scope syntax.  "
-#| "(The scope syntax implicit insert ::) Using both syntaxes together will "
-#| "trigger a bug which some users unfortunately relay on: An option with the "
-#| "unusual name \"<literal>::</literal>\" which acts like every other option "
-#| "with a name. These introduces many problems including that a user who "
-#| "writes multiple lines in this <emphasis>wrong</emphasis> syntax in the "
-#| "hope to append to a list will gain the opposite as only the last "
-#| "assignment for this option \"<literal>::</literal>\" will be used. "
-#| "Upcoming APT versions will raise errors and will stop working if they "
-#| "encounter this misuse, so please correct such statements now as long as "
-#| "APT doesn't complain explicit about them."
 msgid ""
 "Note that appending items to a list using <literal>::</literal> only works "
 "for one item per line, and that you should not use it in combination with "
@@ -3530,18 +3362,19 @@ msgid ""
 "this misuse, so please correct such statements now while APT doesn't "
 "explicitly complain about them."
 msgstr ""
-"Note que você apenas pode usar :: para acrescentar um item por linha a uma "
-"lista e não o deve usar em combinação com a sintaxe scope. (A sintaxe scope "
-"implicitamente insere ::). Usar ambas as sintaxes juntamente irá disparar um "
-"bug que infelizmente alguns utilizadores nos transmitem: Uma opção com o "
-"nome não usual \"<literal>::</literal>\" a qual actua como qualquer outra "
-"opção com um nome. Isto introduz muitos problemas incluindo que, um "
-"utilizador que escreve múltiplas linhas nesta sintaxe <emphasis>errada</"
-"emphasis> na esperança de acrescentar a uma lista, irá ganhar o oposto "
-"porque apenas a última atribuição para esta opção  \"<literal>::</literal>\" "
-"será a usada. Futuras versões do APT irá levantar erros e parar de funcionar "
-"se encontrarem esta má utilização, portanto por favor corrija tais "
-"declarações agora enquanto o APT não se queixa explicitamente acerca delas."
+"Note que acrescentar itens a uma lista usando <literal>::</literal> só "
+"funciona para um item por linha, e que não o deverá usar em combinação com a "
+"sintaxe scope (a qual adiciona <literal>::</literal> implicitamente). Usar "
+"ambas as sintaxes juntamente irá disparar um bug de que infelizmente alguns "
+"utilizadores dependem: uma opção com o nome pouco usual \"<literal>::</"
+"literal>\" o qual actua como qualquer outra opção com um nome. Isto introduz "
+"muitos problemas: por um lado, os utilizadores que escrevem múltiplas linhas "
+"nesta sintaxe <emphasis>errada</emphasis> na esperança de acrescentarem numa "
+"lista irão obter o oposto, pois apenas será usada a última atribuição para "
+"esta opção \"<literal>::</literal>\". Versões futuras do APT irão dar erros "
+"e parar de funcionar se encontrarem esta má utilização, portanto, por favor, "
+"corrija tais declarações agora enquanto o APT ainda não se queixa "
+"explicitamente delas."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:154
@@ -3580,6 +3413,15 @@ msgid ""
 "literal>), and foreign architectures are added to the default list when they "
 "are registered via <command>dpkg --add-architecture</command>."
 msgstr ""
+"Todas as arquitecturas que o sistema suporta. Por exemplo, CPUs que "
+"implementam o conjunto de instruções <literal>amd64</literal> (também "
+"chamada <literal>x86-64</literal>) são também capazes de executar binários "
+"compilados para o conjunto de instruções <literal>i386</literal> "
+"(<literal>x86</literal>). Esta lista é usada quando se busca ficheiros e "
+"analisa listas de pacotes. A predefinição inicial é sempre a arquitectura "
+"nativa do sistema (<literal>APT::Architecture</literal>), e as arquitecturas "
+"alienígenas são adicionadas à lista predefinida quando são registadas via "
+"<command>dpkg --add-architecture</command>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:180
@@ -3631,6 +3473,18 @@ msgid ""
 "A is unpacked but unconfigured - so any package depending on A is now no "
 "longer guaranteed to work, as its dependency on A is no longer satisfied."
 msgstr ""
+"A predefinição é ligada, o que irá fazer com que o APT instale pacotes "
+"essenciais e importantes assim que possível numa operação de instalação/"
+"actualização, de modo a limitar o efeito de uma chamada ao &dpkg; falhada. "
+"Se esta opção for desactivada, o APT trata um pacote importante do mesmo "
+"modo que um pacote extra: entre o desempacotamento do pacote A e a sua "
+"configuração podem existir muitas outras chamadas de desempacotamento ou "
+"configuração para outros pacotes B, C, etc não relacionados. Se eles "
+"causarem a falha da chamada do &dpkg; (ex. porque os scripts do maintainer "
+"do pacote B geram um erro), isto resulta num estado do sistema em que o "
+"pacote A fica desempacotado mas não configurado - então não fica garantido o "
+"funcionamento de qualquer pacote que dependa de A, porque a sua dependência "
+"de A não está mais satisfeita."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:211
@@ -3648,6 +3502,18 @@ msgid ""
 "scenario mentioned above is not the only problem it can help to prevent in "
 "the first place."
 msgstr ""
+"O marcador de configuração imediata também é aplicado no caso potencialmente "
+"problemático de dependências circulares, pois uma dependência com a bandeira "
+"de imediato é equivalente a uma Pré-Dependência. Em teoria isto permite ao "
+"APT reconhecer uma situação na qual está incapaz de executar configuração "
+"imediata, abortar, e sugerir ao utilizador que a opção deverá ser "
+"desactivada temporariamente de modo a permitir que a operação prossiga. Note "
+"o uso da palavra \"teoria\" aqui; no mundo real este problema tem sido "
+"raramente encontrado, em versões não-estável da distribuição, e foram "
+"causados por dependências erradas do pacote em questão ou por um sistema já "
+"no estado corrompido; portanto você não deve desactivar esta opção às cegas. "
+"porque em primeiro lugar o cenário mencionado em cima não é o único problema "
+"que pode ajudar a prevenir."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:224
@@ -3659,17 +3525,15 @@ msgid ""
 "buglink below, so they can work on improving or correcting the upgrade "
 "process."
 msgstr ""
+"Antes de uma grande operação como <literal>dist-upgrade</literal> ser "
+"executada com esta opção desactivada você deve tentar explicitamente um "
+"<literal>install</literal> ao pacote que o APT não é capaz de configurar "
+"imediatamente; mas por favor certifique-se que também reporta o seu problema "
+"à sua distribuição e á equipa do APT com o link de bug em baixo, para que "
+"eles possa trabalhar em melhorar ou corrigir o processo de actualização."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:235
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "Never enable this option unless you <emphasis>really</emphasis> know what "
 "you are doing. It permits APT to temporarily remove an essential package to "
@@ -3680,33 +3544,17 @@ msgid ""
 "<command>dpkg</command>, <command>dash</command> or anything that those "
 "packages depend on."
 msgstr ""
-"Nunca Active esta opção a menos que saiba -realmente- o que está a fazer. "
-"Permite ao APT remover temporariamente um pacote essencial para interromper "
-"um ciclo vicioso de Conflitos/Conflitos ou Conflitos/Pré-Dependência entre "
-"dois pacotes essenciais. TAL CICLO VICIOSO NÃO DEVERÁ NUNCA EXISTIR E É UM "
-"GRAVE BUG. Esta opção deverá funcionar se os pacotes essenciais não forem "
-"tar, gzip, libc, dpkg, bash ou qualquer coisa de que estes dependem."
+"Nunca active esta opção a menos que <emphasis>realmente</emphasis> saiba o "
+"que está a fazer. Ela permite que o APT remova temporariamente um pacote "
+"essencial para quebrar um ciclo infinito de Conflito/Conflito ou Conflito/"
+"Pré-Dependência entre dois pacotes essenciais. <emphasis>Tal ciclo nunca "
+"deveria existir e é um bug grave.</emphasis>. Esta opção irá funcionar se os "
+"pacotes essenciais não forem <command>tar</command>, <command>gzip</"
+"command>, <command>libc</command>, <command>dpkg</command>, <command>dash</"
+"command> ou nada de que esses pacotes dependam."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:247
-#, fuzzy
-#| msgid ""
-#| "APT uses since version 0.7.26 a resizable memory mapped cache file to "
-#| "store the 'available' information. <literal>Cache-Start</literal> acts as "
-#| "a hint to which size the Cache will grow and is therefore the amount of "
-#| "memory APT will request at startup. The default value is 20971520 bytes "
-#| "(~20 MB). Note that these amount of space need to be available for APT "
-#| "otherwise it will likely fail ungracefully, so for memory restricted "
-#| "devices these value should be lowered while on systems with a lot of "
-#| "configured sources this might be increased.  <literal>Cache-Grow</"
-#| "literal> defines in byte with the default of 1048576 (~1 MB) how much the "
-#| "Cache size will be increased in the event the space defined by "
-#| "<literal>Cache-Start</literal> is not enough. These value will be applied "
-#| "again and again until either the cache is big enough to store all "
-#| "information or the size of the cache reaches the <literal>Cache-Limit</"
-#| "literal>.  The default of <literal>Cache-Limit</literal> is 0 which "
-#| "stands for no limit.  If <literal>Cache-Grow</literal> is set to 0 the "
-#| "automatic grow of the cache is disabled."
 msgid ""
 "APT uses since version 0.7.26 a resizable memory mapped cache file to store "
 "the available information. <literal>Cache-Start</literal> acts as a hint of "
@@ -3726,15 +3574,15 @@ msgid ""
 msgstr ""
 "O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de "
 "tamanho ajustável para armazenar a informação disponível. <literal>Cache-"
-"Start</literal> actua como uma dica para que tamanho a Cache irá crescer e é "
+"Start</literal> actua como uma dica do tamanho que a cache irá crescer, e é "
 "por isso a quantidade de memória que o APT irá requerer no arranque. O valor "
 "predefinido é 20971520 bytes (~20 MB). Note que esta quantidade de espaço "
-"precisa estar disponível para o APT caso contrário ele irá con certeza "
+"precisa estar disponível para o APT; caso contrário ele irá com certeza "
 "falhar, portanto para dispositivos com pouca memória este valor deve ser "
-"diminuído enquanto que em sistemas com muitas fontes configuradas este pode "
+"diminuído enquanto que em sistemas com muitas fontes configuradas este deve "
 "ser aumentado. <literal>Cache-Grow</literal> define em bytes com a "
-"predefinição de 1048576 (~1 MB) quanto o tamanho da Cache será aumentado no "
-"caso do espaço definido por <literal>Cache-Start</literal> não ser "
+"predefinição de 1048576 (~1 MB) em quanto o tamanho da Cache será aumentado "
+"no caso do espaço definido por <literal>Cache-Start</literal> não ser "
 "suficiente. Este valor será aplicado várias vezes até que a cache seja "
 "suficientemente grande para armazenar toda a informação ou que o tamanho da "
 "cache alcance o <literal>Cache-Limit</literal>. O valor predefinido de "
@@ -3744,13 +3592,9 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:263
-#, fuzzy
-#| msgid ""
-#| "Defines which package(s) are considered essential build dependencies."
 msgid "Defines which packages are considered essential build dependencies."
 msgstr ""
-"Define quais pacote(s) são considerados dependências essenciais de "
-"compilação."
+"Define quais pacotes são considerados dependências essenciais de compilação."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:267
@@ -3786,30 +3630,17 @@ msgstr "O Grupo Acquire"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:284
-#, fuzzy
-#| msgid ""
-#| "The <literal>Acquire</literal> group of options controls the download of "
-#| "packages and the URI handlers.  <placeholder type=\"variablelist\" id="
-#| "\"0\"/>"
 msgid ""
 "The <literal>Acquire</literal> group of options controls the download of "
 "packages as well as the various \"acquire methods\" responsible for the "
 "download itself (see also &sources-list;)."
 msgstr ""
 "O grupo de opções <literal>Acquire</literal> controla a descarga de pacotes "
-"e os manipuladores de URI. <placeholder type=\"variablelist\" id=\"0\"/>"
+"assim como os vários \"métodos de obtenção\" responsáveis pela própria "
+"descarga (veja também &sources-list;)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:291
-#, fuzzy
-#| msgid ""
-#| "Security related option defaulting to true as an expiring validation for "
-#| "a Release file prevents longtime replay attacks and can e.g. also help "
-#| "users to identify no longer updated mirrors - but the feature depends on "
-#| "the correctness of the time on the user system.  Archive maintainers are "
-#| "encouraged to create Release files with the <literal>Valid-Until</"
-#| "literal> header, but if they don't or a stricter value is volitional the "
-#| "following <literal>Max-ValidTime</literal> option can be used."
 msgid ""
 "Security related option defaulting to true, as giving a Release file's "
 "validation an expiration date prevents replay attacks over a long timescale, "
@@ -3820,29 +3651,18 @@ msgid ""
 "value is desired the <literal>Max-ValidTime</literal> option below can be "
 "used."
 msgstr ""
-"Opção relacionada com segurança com predefinição a 'verdadeiro' como uma "
-"validação expirada para um ficheiro Release previne ataques repetidos "
-"durante longo tempo e pode, por exemplo, ajudar os utilizadores a "
-"identificar mirrors que não são actualizados à muito tempo - mas a "
-"funcionalidade depende da precisão de hora no sistema do utilizador. Os "
-"responsáveis do arquivo são encorajados a criar ficheiros Release com o "
-"cabeçalho <literal>Valid-Until</literal>, mas se não o fizerem ou se "
-"preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
-"ValidTime</literal> seguinte."
+"Opção relacionada com segurança com predefinição a 'verdadeiro', como dar a "
+"um ficheiros Release uma data de expiração previne ataques repetidos durante "
+"longo tempo e pode, por exemplo, ajudar os utilizadores a identificar "
+"mirrors que não são actualizados à muito tempo - mas a funcionalidade "
+"depende da precisão de hora no sistema do utilizador. Os responsáveis do "
+"arquivo são encorajados a criar ficheiros Release com o cabeçalho "
+"<literal>Valid-Until</literal>, mas se não o fizerem ou se preferir-se um "
+"valor mais rigoroso pode-se usar a opção <literal>Max-ValidTime</literal> "
+"seguinte."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:304
-#, fuzzy
-#| msgid ""
-#| "Seconds the Release file should be considered valid after it was created. "
-#| "The default is \"for ever\" (0) if the Release file of the archive "
-#| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
-#| "this date is the default. The date from the Release file or the date "
-#| "specified by the creation time of the Release file (<literal>Date</"
-#| "literal> header) plus the seconds specified with this options are used to "
-#| "check if the validation of a file has expired by using the earlier date "
-#| "of the two. Archive specific settings can be made by appending the label "
-#| "of the archive to the option name."
 msgid ""
 "Maximum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3852,29 +3672,17 @@ msgid ""
 "for \"valid forever\".  Archive specific settings can be made by appending "
 "the label of the archive to the option name."
 msgstr ""
-"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
-"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
-"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
-"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
-"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
-"mais os segundos especificados com esta opção são usados para verificar se a "
-"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
-"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
-"do arquivo ao nome da opção. "
+"O tempo máximo (em segundos) após a sua criação (como indicado pelo "
+"cabeçalho <literal>Date</literal>) que o ficheiro <filename>Release</"
+"filename> deve ser considerado como válido. Se o próprio ficheiro Release "
+"incluir um cabeçalho <literal>Valid-Until</literal> é usada como data de "
+"expiração a data que expira mais cedo. O valor predefinido é <literal>0</"
+"literal> o que significa \"válido para sempre\". Podem ser criadas "
+"definições específicas de arquivo ao acrescentar a etiqueta do arquivo ao "
+"nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:316
-#, fuzzy
-#| msgid ""
-#| "Seconds the Release file should be considered valid after it was created. "
-#| "The default is \"for ever\" (0) if the Release file of the archive "
-#| "doesn't include a <literal>Valid-Until</literal> header.  If it does then "
-#| "this date is the default. The date from the Release file or the date "
-#| "specified by the creation time of the Release file (<literal>Date</"
-#| "literal> header) plus the seconds specified with this options are used to "
-#| "check if the validation of a file has expired by using the earlier date "
-#| "of the two. Archive specific settings can be made by appending the label "
-#| "of the archive to the option name."
 msgid ""
 "Minimum time (in seconds) after its creation (as indicated by the "
 "<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -3884,41 +3692,28 @@ msgid ""
 "checking.  Archive specific settings can and should be used by appending the "
 "label of the archive to the option name."
 msgstr ""
-"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
-"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
-"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
-"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
-"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
-"mais os segundos especificados com esta opção são usados para verificar se a "
-"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
-"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
-"do arquivo ao nome da opção. "
+"O tempo mínimo (em segundos) após a sua criação (como indicado no cabeçalho "
+"<literal>Date</literal>) que o ficheiro <filename>Release</filename> deve "
+"ser considerado como válido. Utilize isto se você necessitar de usar um "
+"mirror raramente actualizado (local) de um arquivo actualizado mais "
+"frequentemente com um cabeçalho <literal>Valid-Until</literal> em vez de "
+"desactivar completamente a verificação de data de expiração. Podem e devem "
+"ser usadas definições especificas do arquivo ao acrescentar a etiqueta do "
+"arquivo ao nome da opção."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:328
-#, fuzzy
-#| msgid ""
-#| "Try to download deltas called <literal>PDiffs</literal> for Packages or "
-#| "Sources files instead of downloading whole ones. True by default."
 msgid ""
 "Try to download deltas called <literal>PDiffs</literal> for indexes (like "
 "<filename>Packages</filename> files) instead of downloading whole ones. True "
 "by default."
 msgstr ""
-"Tenta descarregar deltas chamados <literal>PDiffs</literal> para Pacotes ou "
-"ficheiros Fonte em vez de os descarregar por inteiro. Verdadeiro por "
-"predefinição."
+"Tenta descarregar deltas chamados <literal>PDiffs</literal> para índices "
+"(como os ficheiros <filename>Packages</filename>) em vez de os descarregar "
+"por inteiro. Verdadeiro por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:331
-#, fuzzy
-#| msgid ""
-#| "Two sub-options to limit the use of PDiffs are also available: With "
-#| "<literal>FileLimit</literal> can be specified how many PDiff files are "
-#| "downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
-#| "other hand is the maximum percentage of the size of all patches compared "
-#| "to the size of the targeted file. If one of these limits is exceeded the "
-#| "complete file is downloaded instead of the patches."
 msgid ""
 "Two sub-options to limit the use of PDiffs are also available: "
 "<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -3927,12 +3722,13 @@ msgid ""
 "patches compared to the size of the targeted file. If one of these limits is "
 "exceeded the complete file is downloaded instead of the patches."
 msgstr ""
-"Estão também disponíveis duas sub-opções para limitar o uso de PDiffs: Com "
-"<literal>FileLimit</literal> pode ser especificado quantos ficheiros PDiff "
-"são descarregados no máximo para aplicar um patch a um ficheiro. Por outro "
-"lado <literal>SizeLimit</literal> é a percentagem máxima do tamanho de todas "
-"as patches comparadas com o tamanho do ficheiro de destino. Se um destes "
-"limites for excedido, é descarregado o ficheiro completo em vez das patches."
+"Estão também disponíveis duas sub-opções para limitar o uso de PDiffs: "
+"<literal>FileLimit</literal> pode ser usada para especificar um número "
+"máximo de ficheiros PDiff que devem ser descarregados para actualizar um "
+"ficheiro. Por outro lado <literal>SizeLimit</literal> é a percentagem máxima "
+"do tamanho de todas as patches comparadas com o tamanho do ficheiro de "
+"destino. Se um destes limites for excedido, é descarregado o ficheiro "
+"completo em vez das patches."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:341
@@ -3970,14 +3766,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:359
-#, fuzzy
-#| msgid ""
-#| "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. If no one of the above settings is "
-#| "specified, <envar>http_proxy</envar> environment variable will be used."
 msgid ""
 "<literal>http::Proxy</literal> sets the default proxy to use for HTTP URIs. "
 "It is in the standard form of <literal>http://[[user][:pass]@]host[:port]/</"
@@ -3987,26 +3775,16 @@ msgid ""
 "settings is specified, <envar>http_proxy</envar> environment variable will "
 "be used."
 msgstr ""
-"HTTP URIs; http::Proxy é o proxy http predefinido a usar. Está no formato "
-"standard de <literal>http://[[user][:pass]@]host[:port]/</literal>. Também "
-"pode ser especificados proxies por máquina ao usar o formato <literal>http::"
-"Proxy::&lt;host&gt;</literal> com a palavra chave especial <literal>DIRECT</"
-"literal> que significa não usar proxies. Se nenhuma das definições acima for "
-"especificada, será usada a variável de ambiente <envar>http_proxy</envar>."
+"<literal>http::Proxy</literal> define o proxy http predefinido a usar para "
+"URIs de HTTP. Está no formato standard de <literal>http://[[user][:pass]@]"
+"host[:port]/</literal>. Também podem ser especificados proxies por máquina "
+"ao usar o formato <literal>http::Proxy::&lt;host&gt;</literal> com a palavra "
+"chave especial <literal>DIRECT</literal> que significa não usar proxies. Se "
+"nenhuma das definições acima for especificada, será usada a variável de "
+"ambiente <envar>http_proxy</envar>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:367
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "Three settings are provided for cache control with HTTP/1.1 compliant proxy "
 "caches.  <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -4019,29 +3797,21 @@ msgstr ""
 "São disponibilizadas três definições para controle de cache como caches de "
 "proxy compatíveis com HTTP/1.1. <literal>No-Cache</literal> diz ao proxy "
 "para não usar a sua resposta em cache sob nenhumas circunstâncias, "
-"<literal>Max-Age</literal> é enviado apenas para ficheiros de índice e diz à "
-"cache para refrescar o seu objecto se for mais antigo que o número de "
-"segundos fornecido. Debian actualiza os seus ficheiros índice diariamente, "
-"portanto a predefinição é 1 dia. <literal>No-Store</literal> especifica que "
-"a cache nunca deverá armazenar este requisito, é apenas definido para "
-"ficheiros de arquivo. Isto pode ser útil para prevenir a poluição de uma "
-"cache proxy com ficheiros .deb muito grandes. Nota: o Squid 2.0.2 não "
-"suporta nenhuma destas opções."
+"<literal>Max-Age</literal> define a idade máxima permitida (em segundos) de "
+"um ficheiro índice na cache do proxy. <literal>No-Store</literal> especifica "
+"que o proxy não deve armazenar os ficheiros de arquivo pedidos na sua cache, "
+"o que pode ser usado para prevenir que o proxy polua a sua cache com "
+"(grandes) ficheiros .deb."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:377 apt.conf.5.xml:449
-#, fuzzy
-#| msgid ""
-#| "The option <literal>timeout</literal> sets the timeout timer used by the "
-#| "method; this applies to all things including connection timeout and data "
-#| "timeout."
 msgid ""
 "The option <literal>timeout</literal> sets the timeout timer used by the "
 "method; this value applies to the connection as well as the data timeout."
 msgstr ""
 "A opção <literal>timeout</literal> define o tempo limite usado por este "
-"método, isto aplica-se a todas as coisas incluindo tempos limite de ligação "
-"e tempos limite de dados."
+"método, este valor aplica-se à ligação assim como os tempos de limite de "
+"dados."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:380
@@ -4054,6 +3824,13 @@ msgid ""
 "growing amount of webservers and proxies which choose to not conform to the "
 "HTTP/1.1 specification."
 msgstr ""
+"A definição <literal>Acquire::http::Pipeline-Depth</literal> pode ser usada "
+"para activar o 'pipelining' de HTTP (RFC 2616 secção 8.1.2.2) a qual pode "
+"ser benéfica por exemplo em ligações de alta latência. Especifica quantos "
+"pedidos são enviados num pipeline. As versões anteriores do APT tinham uma "
+"predefinição de 10 para esta definição, mas o valor predefinido agora é 0 (= "
+"desactivado) para evitar problemas com a quantidade crescente de servidores "
+"web e proxies que escolheram não respeitar a especificação HTTP/1.1."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:387
@@ -4061,16 +3838,11 @@ msgid ""
 "<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
 "follow redirects, which is enabled by default."
 msgstr ""
+"<literal>Acquire::http::AllowRedirect</literal> controla se o APT irá seguir "
+"os redireccionamentos, o que está activo por predefinição."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:390
-#, fuzzy
-#| msgid ""
-#| "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
-#| "literal> which accepts integer values in kilobytes. The default value is "
-#| "0 which deactivates the limit and tries uses as much as possible of the "
-#| "bandwidth (Note that this option implicit deactivates the download from "
-#| "multiple servers at the same time.)"
 msgid ""
 "The used bandwidth can be limited with <literal>Acquire::http::Dl-Limit</"
 "literal> which accepts integer values in kilobytes. The default value is 0 "
@@ -4080,9 +3852,9 @@ msgid ""
 msgstr ""
 "A largura de banda usada pode ser limitada com <literal>Acquire::http::Dl-"
 "Limit</literal> que aceita valores inteiros em kilobytes. O valor "
-"predefinido é 0 que desactiva o limite e tenta usar o máximo possível da "
-"largura de banda (Note que esta opção implícita desactiva a descarga de "
-"múltiplos servidores ao mesmo tempo.)"
+"predefinido é 0 que desactiva o limite e tenta usar toda a largura de banda "
+"disponível (note que esta opção implicitamente desactiva a descarga a partir "
+"de múltiplos servidores ao mesmo tempo.)"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:395
@@ -4098,13 +3870,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:403
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
-#| "options are the same as for <literal>http</literal> method and will also "
-#| "default to the options from the <literal>http</literal> method if they "
-#| "are not explicitly set for https. <literal>Pipeline-Depth</literal> "
-#| "option is not supported yet."
 msgid ""
 "The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
 "<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -4113,32 +3878,15 @@ msgid ""
 "are not explicitly set. The <literal>Pipeline-Depth</literal> option is not "
 "yet supported."
 msgstr ""
-"HTTPS URIs. as opções Cache-control, Timeout, AllowRedirect, Dl-Limit e "
-"proxy são as mesmas para o método <literal>http</literal> e irá também usar "
-"as opções predefinidas do método <literal>http</literal> se não forem "
-"explicitamente definidas para https. A opção <literal>Pipeline-Depth</"
+"As opções <literal>Cache-control</literal>, <literal>Timeout</literal>, "
+"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> e "
+"<literal>proxy</literal> funcionam para URIs HTTPS do mesmo modo que para o "
+"método <literal>http</literal>, e tem por predefinição os mesmos valores se "
+"estes não forem definidos especificamente A opção <literal>Pipeline-Depth</"
 "literal> ainda não é suportada."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:411
-#, fuzzy
-#| msgid ""
-#| "<literal>CaInfo</literal> suboption specifies place of file that holds "
-#| "info about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> "
-#| "is the corresponding per-host option.  <literal>Verify-Peer</literal> "
-#| "boolean suboption determines whether verify server's host certificate "
-#| "against trusted certificates or not.  <literal>&lt;host&gt;::Verify-Peer</"
-#| "literal> is the corresponding per-host option.  <literal>Verify-Host</"
-#| "literal> boolean suboption determines whether verify server's hostname or "
-#| "not.  <literal>&lt;host&gt;::Verify-Host</literal> is the corresponding "
-#| "per-host option.  <literal>SslCert</literal> determines what certificate "
-#| "to use for client authentication. <literal>&lt;host&gt;::SslCert</"
-#| "literal> is the corresponding per-host option.  <literal>SslKey</literal> "
-#| "determines what private key to use for client authentication. "
-#| "<literal>&lt;host&gt;::SslKey</literal> is the corresponding per-host "
-#| "option.  <literal>SslForceVersion</literal> overrides default SSL version "
-#| "to use.  Can contain 'TLSv1' or 'SSLv3' string.  <literal>&lt;host&gt;::"
-#| "SslForceVersion</literal> is the corresponding per-host option."
 msgid ""
 "<literal>CaInfo</literal> suboption specifies place of file that holds info "
 "about trusted certificates.  <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -4160,39 +3908,24 @@ msgid ""
 msgstr ""
 "A sub-opção <literal>CaInfo</literal> especifica o lugar do ficheiro que "
 "contém informação acerca de certificados de confiança. <literal>&lt;"
-"host&gt;::CaInfo</literal> é a opção por máquina correspondente. A sub-opção "
-"booleana <literal>Verify-Peer</literal> determina se o certificado da "
-"máquina servidora é um certificado de confiança ou não. <literal>&lt;"
-"host&gt;::Verify-Peer</literal> é a opção por máquina correspondente. A sub-"
-"opção <literal>Verify-Host</literal> determina se o nome da máquina "
-"servidora é verificado ou não. <literal>&lt;host&gt;::Verify-Host</literal> "
-"é a opção por máquina correspondente. <literal>SslCert</literal> determina "
-"qual certificado a usar para autenticação de clientes <literal>&lt;host&gt;::"
-"SslCert</literal> é a opção por máquina correspondente. <literal>SslKey</"
-"literal> determina qual chave privada a usar para autenticação de clientes. "
-"<literal>&lt;host&gt;::SslKey</literal> é a opção por máquina "
-"correspondente. <literal>SslForceVersion</literal> sobrepõe a versão SSL "
-"predefinida a usar. Pode conter strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
-"host&gt;::SslForceVersion</literal> é a opção po máquina correspondente."
+"host&gt;::CaInfo</literal> é a opção 'por máquina' correspondente. A sub-"
+"opção booleana <literal>Verify-Peer</literal> determina se o certificado da "
+"máquina anfitriã deve ou não ser verificado com certificados de confiança. "
+"<literal>&lt;host&gt;::Verify-Peer</literal> é a opção 'por máquina' "
+"correspondente. A sub-opção booleana <literal>Verify-Host</literal> "
+"determina se o nome da máquina servidora deve ao não ser verificado. "
+"<literal>&lt;host&gt;::Verify-Host</literal> é a opção 'por máquina' "
+"correspondente. <literal>SslCert</literal> determina qual certificado a usar "
+"para autenticação de clientes. <literal>&lt;host&gt;::SslCert</literal> é a "
+"opção 'por máquina' correspondente. <literal>SslKey</literal> determina qual "
+"a chave privada a usar para autenticação de clientes. <literal>&lt;host&gt;::"
+"SslKey</literal> é a opção 'por máquina' correspondente. "
+"<literal>SslForceVersion</literal> sobrepõe a versão SSL predefinida a usar. "
+"Pode conter qualquer uma das strings 'TLSv1' ou 'SSLv3'. <literal>&lt;"
+"host&gt;::SslForceVersion</literal> é a opção 'por máquina' correspondente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:432
-#, fuzzy
-#| msgid ""
-#| "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the "
-#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>ftp::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. If no one of the above settings is "
-#| "specified, <envar>ftp_proxy</envar> environment variable will be used. 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 substitution "
-#| "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."
 msgid ""
 "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
 "It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
@@ -4209,31 +3942,23 @@ msgid ""
 "$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</"
 "literal> and <literal>$(SITE_PORT)</literal>."
 msgstr ""
-"URIs FTP; ftp::Proxy é o proxy ftp predefinido a usar. Está no formato "
-"standard de <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Os "
-"proxies por máquina podem também ser especificados ao usar o formato "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> com a palavra chave especial "
-"<literal>DIRECT</literal> que significa não usar nenhum proxy. Se nenhuma "
-"das definições acima for especificada, será usada a variável de ambiente "
-"<envar>ftp_proxy</envar>. Para usar um proxy ftp você tem que definir o "
-"script <literal>ftp::ProxyLogin</literal> no ficheiro de configuração. Esta "
-"entrada especifica os comandos a enviar para dizer ao servidor proxy ao que "
-"se ligar. Por favor veja &configureindex; para um exemplo de como fazer "
-"isto. As variáveis de substituição disponíveis são <literal>$(PROXY_USER)</"
-"literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> "
-"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e <literal>"
-"$(SITE_PORT)</literal>. Cada uma é tirada do seu componente URI respectivo."
+"<literal>ftp::Proxy</literal> define o proxy predefinido a usar para URIs "
+"FTP. Está no formato standard de <literal>ftp://[[user][:pass]@]host[:port]/"
+"</literal>. Os proxies por máquina podem também ser especificados ao usar o "
+"formato <literal>ftp::Proxy::&lt;host&gt;</literal> com a palavra chave "
+"especial <literal>DIRECT</literal> que significa não usar nenhum proxy. Se "
+"nenhuma das definições acima for especificada, será usada a variável de "
+"ambiente <envar>ftp_proxy</envar>. Para usar um proxy FTP você tem que "
+"definir o script <literal>ftp::ProxyLogin</literal> no ficheiro de "
+"configuração. Esta entrada especifica os comandos a enviar para dizer ao "
+"servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
+"exemplo de como fazer isto. As variáveis de substituição que representam o "
+"componente URI correspondente são <literal>$(PROXY_USER)</literal> <literal>"
+"$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)"
+"</literal> <literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:452
-#, fuzzy
-#| msgid ""
-#| "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)."
 msgid ""
 "Several settings are provided to control passive mode. Generally it is safe "
 "to leave passive mode on; it works in nearly every environment.  However, "
@@ -4245,8 +3970,8 @@ msgstr ""
 "Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos "
 "ambientes. No entanto algumas situações requerem que o modo passivo seja "
 "desactivado e em vez disso usar o  modo port ftp. Isto pode ser feito "
-"globalmente, para ligações que passam por um proxy ou para uma máquina "
-"específica (Veja a amostra de ficheiro de configuração para exemplos)."
+"globalmente ou para ligações que passam por um proxy ou para uma máquina "
+"específica (veja a amostra de ficheiro de configuração para exemplos)."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:459
@@ -4285,16 +4010,6 @@ msgstr "/cdrom/::Mount \"foo\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:473
-#, fuzzy
-#| msgid ""
-#| "CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
-#| "<literal>cdrom::Mount</literal> which must be the mount point for the CD-"
-#| "ROM 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 <placeholder type=\"literallayout\" id="
-#| "\"0\"/> within the cdrom block. It is important to have the trailing "
-#| "slash. Unmount commands can be specified using UMount."
 msgid ""
 "For URIs using the <literal>cdrom</literal> method, the only configurable "
 "option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -4305,29 +4020,23 @@ msgid ""
 "<literal>cdrom</literal> block. It is important to have the trailing slash.  "
 "Unmount commands can be specified using UMount."
 msgstr ""
-"CD-ROM URIs; a única definição para URIs de CD-ROM é o ponto de montagem, "
-"<literal>cdrom::Mount</literal> que deve ser o ponto de montagem para a "
-"drive de CD-ROM como especificado em <filename>/etc/fstab</filename>. É "
-"possível fornecer comandos de montar e desmontar alternativos se o seu ponto "
-"de montagem não puder ser listado na fstab (como uma montagem SMB e pacotes "
-"de montagem antiga). A sintaxe é colocar  <placeholder type=\"literallayout"
-"\" id=\"0\"/> dentro do bloco cdrom. É importante ter a barra final. "
-"Comandos para desmontar podem ser especificados usando UMount."
+"Para URIs que usam o método <literal>cdrom</literal>, a única opção "
+"configurável é ponto de montagem, <literal>cdrom::Mount</literal>, o qual "
+"deve ser o ponto de montagem para o leitor de CD-ROM (ou DVD, etc.) como "
+"especificado em <filename>/etc/fstab</filename>.É possível fornecer comandos "
+"de montar e desmontar alternativos se o seu ponto de montagem não puder ser "
+"listado na fstab. A sintaxe é colocar  <placeholder type=\"literallayout\" "
+"id=\"0\"/> dentro do bloco <literal>cdrom</literal>. É importante ter a "
+"barra final. Comandos para desmontar podem ser especificados usando o UMount."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:486
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "For GPGV URIs the only configurable option is <literal>gpgv::Options</"
 "literal>, which passes additional parameters to gpgv."
 msgstr ""
-"GPGV URIs;a única opção para GPGV URIs é a opção para passar parâmetros "
-"adicionais ao gpgv. <literal>gpgv::Options</literal> Opções adicionais "
-"passadas ao gpgv."
+"Para URIs de GPGV a única opção configurável é <literal>gpgv::Options</"
+"literal>, a qual passa parâmetros adicionais ao gpgv."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:497
@@ -4368,21 +4077,6 @@ msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:498
-#, fuzzy
-#| msgid ""
-#| "Also, the <literal>Order</literal> subgroup can be used to define in "
-#| "which order the acquire system will try to download the compressed files. "
-#| "The acquire system will try the first and proceed with the next "
-#| "compression type in this list on error, so to prefer one over the other "
-#| "type simply add the preferred type first - not already added default "
-#| "types will be added at run time to the end of the list, so e.g. "
-#| "<placeholder type=\"synopsis\" id=\"0\"/> can be used to prefer "
-#| "<command>gzip</command> compressed files over <command>bzip2</command> "
-#| "and <command>lzma</command>.  If <command>lzma</command> should be "
-#| "preferred over <command>gzip</command> and <command>bzip2</command> the "
-#| "configure setting should look like this <placeholder type=\"synopsis\" id="
-#| "\"1\"/> It is not needed to add <literal>bz2</literal> explicit to the "
-#| "list as it will be added automatic."
 msgid ""
 "Also, the <literal>Order</literal> subgroup can be used to define in which "
 "order the acquire system will try to download the compressed files. The "
@@ -4403,15 +4097,15 @@ msgstr ""
 "comprimidos. O sistema de aquisição irá tentar com o primeiro e prosseguir "
 "com o próximo tipo de compressão na lista em caso de erro, portanto para "
 "preferir um sobre outro tipo, simplesmente adicione o tipo preferido em "
-"primeiro lugar - tipos predefinidos não já adicionados serão adicionados em "
-"tempo de execução ao fim da lista, então, ex. <placeholder type=\"synopsis\" "
-"id=\"0\"/> pode ser usado para preferir ficheiros comprimidos em "
-"<command>gzip</command> sobre <command>bzip2</command> e <command>lzma</"
-"command>. Se o <command>lzma</command> deve ser preferido sobre "
-"<command>gzip</command> e <command>bzip2</command> a definição de "
-"configuração deverá parecer-se com isto: <placeholder type=\"synopsis\" id="
-"\"1\"/>. Não é necessário adicionar explicitamente <literal>bz2</literal> à "
-"lista pois será adicionado automaticamente."
+"primeiro lugar - tipos predefinidos não já adicionados serão acrescentados "
+"implicitamente ao fim da lista, então, ex. <placeholder type=\"synopsis\" id="
+"\"0\"/> pode ser usado para preferir ficheiros comprimidos em <command>gzip</"
+"command> sobre <command>bzip2</command> e <command>lzma</command>. Se o "
+"<command>lzma</command> deve ser preferido sobre <command>gzip</command> e "
+"<command>bzip2</command> a definição de configuração deverá parecer-se com "
+"isto: <placeholder type=\"synopsis\" id=\"1\"/>. Não é necessário adicionar "
+"explicitamente <literal>bz2</literal> à lista pois isso será adicionado "
+"automaticamente."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml:512
@@ -4421,18 +4115,6 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:507
-#, fuzzy
-#| msgid ""
-#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
-#| "replaceable></literal> will be checked: If this setting exists the method "
-#| "will only be used if this file exists, e.g. for the bzip2 method (the "
-#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
-#| "also that list entries specified on the command line will be added at the "
-#| "end of the list specified in the configuration files, but before the "
-#| "default entries. To prefer a type in this case over the ones specified in "
-#| "in the configuration files you can set the option direct - not in list "
-#| "style.  This will not override the defined list; it will only prefix the "
-#| "list with this type."
 msgid ""
 "Note that the <literal>Dir::Bin::<replaceable>Methodname</replaceable></"
 "literal> will be checked at run time. If this option has been set, the "
@@ -4445,16 +4127,17 @@ msgid ""
 "list style.  This will not override the defined list; it will only prefix "
 "the list with this type."
 msgstr ""
-"Note que em tempo de execução será verificado o <literal>Dir::Bin::"
-"<replaceable>nome de método</replaceable></literal>: se esta definição "
-"existir, o método apenas será usado se este ficheiro existir, ex. para o "
-"método bzip2 (o embutido) a definição é <placeholder type=\"literallayout\" "
-"id=\"0\"/>. Note também que as entradas na lista especificadas na linha de "
-"comandos serão adicionadas no fim da lista especificada nos ficheiros de "
-"configuração, mas antes das entradas predefinidas. Para preferir um tipo "
-"neste caso sobre aqueles especificados nos ficheiros de configuração você "
-"pode definir a opção directamente - não em estilo de lista. Isto não irá "
-"sobrepor a lista definida, irá apenas prefixar a lista com este tipo."
+"Note que o <literal>Dir::Bin::<replaceable>nome de método</replaceable></"
+"literal> será verificado em tempo de execução. Se esta definição estiver "
+"definida, o método apenas será usado se este ficheiro existir; ex. para o "
+"método <literal>bzip2</literal> (o embutido) a definição é: <placeholder "
+"type=\"literallayout\" id=\"0\"/>. Note também que as entradas na lista "
+"especificadas na linha de comandos serão adicionadas no fim da lista "
+"especificada nos ficheiros de configuração, mas antes das entradas "
+"predefinidas. Para preferir um tipo neste caso sobre aqueles especificados "
+"nos ficheiros de configuração você pode definir a opção directamente - não "
+"em estilo de lista. Isto não irá sobrepor a lista definida, irá apenas "
+"prefixar a lista com este tipo."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:517
@@ -4463,6 +4146,10 @@ msgid ""
 "uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
+"O tipo especial <literal>uncompressed</literal> pode ser usado para dar "
+"preferência a ficheiros não comprimidos, mas note que a maioria dos arquivos "
+"não disponibiliza ficheiros não comprimidos, portanto isto é usado "
+"maioritariamente apenas para mirrors locais."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:524
@@ -4479,16 +4166,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:532
-#, fuzzy
-#| msgid ""
-#| "The Languages subsection controls which <filename>Translation</filename> "
-#| "files are downloaded and in which order APT tries to display the "
-#| "description-translations. APT will try to display the first available "
-#| "description in the language which is listed first. Languages can be "
-#| "defined with their short or long language codes. Note that not all "
-#| "archives provide <filename>Translation</filename> files for every "
-#| "Language - especially the long Languagecodes are rare, so please inform "
-#| "you which ones are available before you set here impossible values."
 msgid ""
 "The Languages subsection controls which <filename>Translation</filename> "
 "files are downloaded and in which order APT tries to display the description-"
@@ -4499,14 +4176,13 @@ msgid ""
 "language codes are especially rare."
 msgstr ""
 "A subsecção Languages controla quais ficheiros <filename>Translation</"
-"filename> são descarregados e em que ordem o APT tenta mostrar as Traduções "
-"das Descrições. O APT irá tentar mostra a primeira Descrição disponível para "
-"a Linguagem que está listada em primeiro. As linguagens podem ser definidas "
-"com os seus códigos de linguagem curtos ou longos. Note que nem todos os "
-"arquivos disponibilizam ficheiros <filename>Translation</filename> para "
-"todas as Linguagens - especialmente os códigos de linguagem longos são "
-"raros, portanto por favor informe-se sobre os quais estão disponíveis antes "
-"de definir aqui valores impossíveis."
+"filename> são descarregados e em que ordem o APT tenta mostrar as traduções "
+"das descrições. O APT irá tentar mostrar a primeira descrição disponível "
+"para a linguagem que está listada em primeiro. As linguagens podem ser "
+"definidas com os seus códigos de linguagem curtos ou longos. Note que nem "
+"todos os arquivos disponibilizam ficheiros <filename>Translation</filename> "
+"para todas as linguagens - os códigos de linguagem longos são "
+"especialmenteraros."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
 #: apt.conf.5.xml:549
@@ -4516,26 +4192,6 @@ msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\";
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:537
-#, fuzzy
-#| msgid ""
-#| "The default list includes \"environment\" and \"en\". "
-#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
-#| "replaced at runtime with the languagecodes extracted from the "
-#| "<literal>LC_MESSAGES</literal> environment variable.  It will also ensure "
-#| "that these codes are not included twice in the list. If "
-#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
-#| "<filename>Translation-en</filename> file (if available) will be used.  To "
-#| "force APT to use no Translation file use the setting <literal>Acquire::"
-#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-#| "meaning code which will stop the search for a suitable "
-#| "<filename>Translation</filename> file.  This can be used by the system "
-#| "administrator to let APT know that it should download also this files "
-#| "without actually use them if the environment doesn't specify this "
-#| "languages. So the following example configuration will result in the "
-#| "order \"en, de\" in an english and in \"de, en\" in a german "
-#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
-#| "used in a french localization, in such an environment the order would be "
-#| "\"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "The default list includes \"environment\" and \"en\". "
 "\"<literal>environment</literal>\" has a special meaning here: it will be "
@@ -4565,13 +4221,13 @@ msgstr ""
 "tradução use a definição <literal>Acquire::Languages=none</literal>. "
 "\"<literal>none</literal>\" é outro código de significado especial que irá "
 "parar a procura por um ficheiro <filename>Translation</filename> apropriado. "
-"Isto pode ser usado pelo administrador do sistema para dizer ao APT que deve "
-"também descarregar estes ficheiros sem realmente os usar, se o ambiente não "
-"especificar estas linguagens. Portanto o seguinte exemplo de configuração "
-"irá resultar na ordem \"en, de\" num ambiente em inglês e \"de, en\" num "
-"ambiente em alemão. Note que o \"fr\" é descarregado, mas não é usado se o "
-"APT não for usado num ambiente em francês, em tal ambiente a ordem deveria "
-"ser \"fr, de, en\".  <placeholder type=\"programlisting\" id=\"0\"/>"
+"Isto diz ao APT para também descarregar estes ficheiros sem realmente os "
+"usar a menos que o ambiente especifique as linguagens. Portanto o seguinte "
+"exemplo de configuração irá resultar na ordem \"en, de\" num ambiente em "
+"Inglês e \"de, en\" num ambiente em Alemão. Note que o \"fr\" é "
+"descarregado, mas não é usado a menos que o APT seja usado num ambiente em "
+"Francês (onde a ordem deveria ser \"fr, de, en\".  <placeholder type="
+"\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:550
@@ -4581,23 +4237,19 @@ msgid ""
 "files which are found in <filename>/var/lib/apt/lists/</filename> will be "
 "added to the end of the list (after an implicit \"<literal>none</literal>\")."
 msgstr ""
+"Nota: Para prevenir problemas resultantes do APT ser executado em ambientes "
+"diferentes (ex. por diferentes utilizadores ou por outros programas) todos "
+"os ficheiros de Tradução que se encontram em <filename>/var/lib/apt/lists/</"
+"filename> serão adicionados ao final da lista (após um \"<literal>none</"
+"literal>\" implícito)."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:560
 msgid "Directories"
-msgstr "Directories"
+msgstr "Directórios"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:562
-#, fuzzy
-#| msgid ""
-#| "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>."
 msgid ""
 "The <literal>Dir::State</literal> section has directories that pertain to "
 "local state information. <literal>lists</literal> is the directory to place "
@@ -4611,23 +4263,12 @@ msgstr ""
 "informação de estado local. <literal>lists</literal> é o directório para "
 "colocar listas de pacotes descarregadas e <literal>status</literal> é o nome "
 "do ficheiro de estado do &dpkg;. <literal>preferences</literal> é o nome do "
-"ficheiro de preferências do APT. <literal>Dir::State</literal> contém o "
-"directório predefinido para pré-fixar em todos os sub items que não começam "
-"com <filename>/</filename> ou <filename>./</filename>."
+"ficheiro <filename>preferences</filename> do APT. <literal>Dir::State</"
+"literal> contém o directório predefinido para pré-fixar em todos os sub-"
+"items que não começam com <filename>/</filename> ou <filename>./</filename>."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:569
-#, fuzzy
-#| msgid ""
-#| "<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 preferable to turn "
-#| "off the pkgcache rather than the srcpkgcache. Like <literal>Dir::State</"
-#| "literal> the default directory is contained in <literal>Dir::Cache</"
-#| "literal>"
 msgid ""
 "<literal>Dir::Cache</literal> contains locations pertaining to local cache "
 "information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4642,10 +4283,11 @@ msgstr ""
 "da cache local, como as caches de dois pacotes <literal>srcpkgcache</"
 "literal> e <literal>pkgcache</literal> assim como a localização onde colocar "
 "arquivos descarregados, <literal>Dir::Cache::archives</literal>. A geração "
-"de caches pode ser desligada ao definir os seus nomes para vazio. Isto irá "
-"abrandar o arranque mas poupar espaço em disco. Provavelmente é preferível "
-"desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::State</"
-"literal> o directório predefinido é contido em <literal>Dir::Cache</literal>"
+"de caches pode ser desligada ao definir os seus nomes para uma string vazia. "
+"Isto irá abrandar o arranque mas poupar espaço em disco. Provavelmente é "
+"preferível desligar o pkgcache em vez do srcpkgcache. Tal como <literal>Dir::"
+"State</literal> o directório predefinido é contido em <literal>Dir::Cache</"
+"literal>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:578
@@ -4835,13 +4477,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:674
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "This is a list of shell commands to run before invoking &dpkg;. Like "
 "<literal>options</literal> this must be specified in list notation. The "
@@ -4852,9 +4487,9 @@ msgstr ""
 "Isto é uma lista de comandos shell para executar antes de invocar o &dpkg;. "
 "Tal como as <literal>opções</literal> isto tem que ser especificado em "
 "notação listada. Os  comandos são invocados em ordem usando <filename>/bin/"
-"sh</filename>, caso algum deles falhe, o APT irá abortar. O APT passa para "
-"os comandos na entrada standard os nomes de ficheiros de todos os ficheiros ."
-"deb que vai instalar, um por cada linha."
+"sh</filename>, caso algum deles falhe, o APT irá abortar. O APT irá passar "
+"para os comandos os nomes de ficheiros de todos os ficheiros .deb que vai "
+"instalar, um por cada linha na entrada standard."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:680
@@ -4896,19 +4531,6 @@ msgstr "Utilização trigger do dpkg (e opções relacionadas)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt.conf.5.xml:699
-#, fuzzy
-#| msgid ""
-#| "APT can call &dpkg; in a way so it can make aggressive use of triggers "
-#| "over multiply calls of &dpkg;. Without further options &dpkg; will use "
-#| "triggers only in between his own run. Activating these options can "
-#| "therefore decrease the time needed to perform the install / upgrade. Note "
-#| "that it is intended to activate these options per default in the future, "
-#| "but as it changes the way APT calling &dpkg; drastically it needs a lot "
-#| "more testing.  <emphasis>These options are therefore currently "
-#| "experimental and should not be used in production environments.</"
-#| "emphasis> Also it breaks the progress reporting so all frontends will "
-#| "currently stay around half (or more) of the time in the 100% state while "
-#| "it actually configures all packages."
 msgid ""
 "APT can call &dpkg; in such a way as to let it make aggressive use of "
 "triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -4921,17 +4543,17 @@ msgid ""
 "reporting such that all front-ends will currently stay around half (or more) "
 "of the time in the 100% state while it actually configures all packages."
 msgstr ""
-"APT pode chamar o &dpkg; num modo que faz uso agressivo dos triggers sobre "
-"múltiplas chamadas do &dpkg;. Sem mais opções o &dpkg; irá usar triggers "
-"apenas entre a sua própria execução. Activando estas opções pode portanto "
-"diminuir o tempo necessário para executar a instalação / actualização. Note "
-"que é intenção futura activar estas opções por predefinição, mas como muda "
-"drasticamente a maneira como o APT chama o &dpkg;, precisa de muitos mais "
-"testes. <emphasis>Estas opções são portanto experimentais e não deve ser "
-"usadas em ambientes produtivos.</emphasis> Também interrompe o relatório de "
-"progresso, então todos os frontends irão permanecer a cerca de metade (ou "
-"mais) do tempo no estado de 100% enquanto na realidade está a configurar "
-"todos os pacotes."
+"O APT pode chamar o &dpkg; num tal modo que o deixa fazer uso agressivo dos "
+"triggers sobre múltiplas chamadas do &dpkg;. Sem mais opções o &dpkg; irá "
+"usar triggers uma vez por cada vez que corre. Activando estas opções pode "
+"portanto diminuir o tempo necessário para executar a instalação ou "
+"actualização. Note que é intenção futura activar estas opções por "
+"predefinição, mas como muda drasticamente a maneira como o APT chama o "
+"&dpkg;, precisa de muitos mais testes. <emphasis>Estas opções são portanto "
+"presentemente experimentais e não deve ser usadas em ambientes produtivos.</"
+"emphasis> Também interrompe o relatório de progresso de modo que todos os "
+"front-ends irão permanecer a cerca de metade (ou mais) do tempo no estado de "
+"100% enquanto na realidade está a configurar todos os pacotes."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 #: apt.conf.5.xml:714
@@ -4995,20 +4617,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:729
-#, fuzzy
-#| msgid ""
-#| "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-#| "and \"<literal>no</literal>\".  \"<literal>all</literal>\" is the default "
-#| "value and causes APT to configure all packages explicit.  The "
-#| "\"<literal>smart</literal>\" way is it to configure only packages which "
-#| "need to be configured before another package can be unpacked (Pre-"
-#| "Depends) and let the rest configure by &dpkg; with a call generated by "
-#| "the next option. \"<literal>no</literal>\" on the other hand will not "
-#| "configure anything and totally rely on &dpkg; for configuration (which "
-#| "will at the moment fail if a Pre-Depends is encountered).  Setting this "
-#| "option to another than the all value will implicitly activate also the "
-#| "next option per default as otherwise the system could end in an "
-#| "unconfigured status which could be unbootable!"
 msgid ""
 "Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
 "and \"<literal>no</literal>\".  The default value is \"<literal>all</literal>"
@@ -5024,28 +4632,21 @@ msgid ""
 "unconfigured and potentially unbootable state."
 msgstr ""
 "Valores válidos são \"<literal>all</literal>\", \"<literal>smart</literal>\" "
-"e \"<literal>no</literal>\".  \"<literal>all</literal>\" é o valor "
-"predefinido e faz com que o APT configure todos os pacotes explícitos. O "
-"modo \"<literal>smart</literal>\" serve para configurar apenas pacotes que "
+"e \"<literal>no</literal>\".  O valor predefinido é \"<literal>all</literal>"
+"\" que faz com que o APT configure todos os pacotes. O modo "
+"\"<literal>smart</literal>\" serve para configurar apenas pacotes que "
 "precisam de ser configurados antes que outro pacote possa ser desempacotado "
 "(pré-dependências) e o resto configurado pelo &dpkg; com uma chamada gerada "
-"pela próxima opção. \"<literal>no</literal>\" por outro lado não irá "
-"configurar nada e confiar no &dpkg; para configurações (o qual irá falhar se "
-"encontrar uma pré-dependência). Definir esta opção para outra que não seja o "
-"valor all irá implicitamente activar também a próxima opção predefinida, "
-"caso contrário o sistema poderia acabar num estado não configurado o qual "
-"poderia não arrancar!"
+"pela opção ConfigurePending (veja em baixo). Por outro lado, \"<literal>no</"
+"literal>\" não irá configurar nada e confiar no &dpkg; para configurações (o "
+"que de momento irá falhar se encontrar uma pré-dependência). Definir esta "
+"opção para qualquer valor que diferente de <literal>all</literal> irá também "
+"implicitamente activar a próxima opção predefinida caso contrário o sistema "
+"poderia acabar num estado não configurado onde potencialmente poderia não "
+"arrancar."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:744
-#, fuzzy
-#| msgid ""
-#| "If this option is set, APT will call <command>dpkg --configure --pending</"
-#| "command> to let &dpkg; handle all required configurations and triggers. "
-#| "This option is activated automatically per default if the previous option "
-#| "is not set to <literal>all</literal>, but deactivating it could be useful "
-#| "if you want to run APT multiple times in a row - e.g. in an installer. In "
-#| "these sceneries you could deactivate this option in all but the last run."
 msgid ""
 "If this option is set APT will call <command>dpkg --configure --pending</"
 "command> to let &dpkg; handle all required configurations and triggers. This "
@@ -5460,7 +5061,7 @@ msgstr ""
 #: apt.conf.5.xml:1150 apt_preferences.5.xml:545 sources.list.5.xml:211
 #: apt-ftparchive.1.xml:596
 msgid "Examples"
-msgstr "Examples"
+msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1151
@@ -5497,16 +5098,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:42
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "Several versions of a package may be available for installation when the "
 "&sources-list; file contains references to more than one distribution (for "
@@ -5522,20 +5113,13 @@ msgstr ""
 "(por exemplo, <literal>stable</literal> e <literal>testing</literal>). O APT "
 "atribui uma prioridade a cada versão que está disponível. Sujeito a "
 "constrangimentos de dependências, o <command>apt-get</command> selecciona a "
-"versão com a prioridade mais alta para instalação. O ficheiro de "
-"preferências do APT sobrepõe as prioridades que o APT atribui às versões de "
-"pacotes por predefinição, assim dando controle ao utilizador sobre qual é "
-"seleccionado para instalação."
+"versão com a prioridade mais alta para instalação. As preferências do APT "
+"sobrepõem as prioridades que o APT atribui às versões de pacotes por "
+"predefinição, assim dando controle ao utilizador sobre qual é seleccionado "
+"para instalação."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:52
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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 "
@@ -5546,8 +5130,8 @@ msgstr ""
 "Podem estar disponíveis várias instâncias da mesma versão de um pacote "
 "quando o ficheiro &sources-list; contém referências a mais do que uma fonte. "
 "Neste caso o <command>apt-get</command> descarrega a instância listada mais "
-"cedo no ficheiro &sources-list;. O ficheiro de preferências do APT não "
-"afecta a escolha da instância, apenas a escolha da versão."
+"cedo no ficheiro &sources-list;. As preferências do APT não afectam a "
+"escolha da instância, apenas a escolha da versão."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:59
@@ -5575,14 +5159,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:70
-#, fuzzy
-#| msgid ""
-#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
-#| "directory are parsed in alphanumeric ascending order and need to obey the "
-#| "following naming convention: The files have no or \"<literal>pref</"
-#| "literal>\" as filename extension and which only contain alphanumeric, "
-#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
-#| "will be silently ignored."
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -5595,10 +5171,13 @@ msgid ""
 msgstr ""
 "Note que os ficheiros no directório <filename>/etc/apt/preferences.d</"
 "filename> são analisados em ordem alfanumérica ascendente e precisam "
-"obedecer à convenção de nomes seguinte: Os ficheiros não têm extensão ou têm "
-"\"<literal>pref</literal>\" na extensão do nome de ficheiro e os quais "
-"apenas contêm caracteres alfanuméricos, traço (-), underscore (_) e ponto "
-"(.) - caso contrário serão ignorados em silêncio."
+"obedecer à convenção de nomes seguinte: Os ficheiros ou não têm extensão ou "
+"têm \"<literal>pref</literal>\" na extensão do nome de ficheiro e apenas "
+"contêm caracteres alfanuméricos, traço (-), underscore (_) e ponto (.). Caso "
+"contrário o APT irá escrever um aviso de que ignorou um ficheiro, a menos "
+"que esse ficheiro corresponda a um padrão da lista de configuração "
+"<literal>Dir::Ignore-Files-Silently</literal> - e neste caso será ignorado "
+"em silêncio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:79
@@ -5647,18 +5226,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:101
-#, fuzzy
-#| msgid ""
-#| "If the target release has been specified then APT uses the following "
-#| "algorithm to set the priorities of the versions of a package.  Assign: "
-#| "<placeholder type=\"variablelist\" id=\"0\"/>"
 msgid ""
 "If the target release has been specified then APT uses the following "
 "algorithm to set the priorities of the versions of a package.  Assign:"
 msgstr ""
 "Se o lançamento destinado foi especificado, então o APT usa o seguinte "
-"algoritmo para definir as prioridades das versões de um pacote. Atribuir: "
-"<placeholder type=\"variablelist\" id=\"0\"/>"
+"algoritmo para definir as prioridades das versões de um pacote. Atribuir:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:106
@@ -5667,11 +5240,6 @@ msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:107
-#, fuzzy
-#| msgid ""
-#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
-#| "experimental archive."
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
@@ -5679,8 +5247,9 @@ msgid ""
 "<literal>experimental</literal> archive."
 msgstr ""
 "para as versões vindas de arquivos cujos ficheiros <filename>Release</"
-"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
-"experimental da Debian."
+"filename> estejam marcados como \"NotAutomatic: yes\" mas <emphasis>não</"
+"emphasis> como \"ButAutomaticUpgrades: yes\" como o arquivo "
+"<literal>experimental</literal> da Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:113
@@ -5689,20 +5258,16 @@ msgstr "priority 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:114
-#, fuzzy
-#| msgid ""
-#| "to the versions coming from archives which in their <filename>Release</"
-#| "filename> files are marked as \"NotAutomatic: yes\" like the Debian "
-#| "experimental archive."
 msgid ""
 "to the version that is already installed (if any) and to the versions coming "
 "from archives which in their <filename>Release</filename> files are marked "
 "as \"NotAutomatic: yes\" and \"ButAutomaticUpgrades: yes\" like the Debian "
 "backports archive since <literal>squeeze-backports</literal>."
 msgstr ""
-"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
-"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
-"experimental da Debian."
+"para a versão que já está instalada (se alguma) e para as versões vindas de "
+"arquivos cujos ficheiros <filename>Release</filename> estejam marcados como "
+"\"NotAutomatic: yes\" e \"ButAutomaticUpgrades: yes\" como o arquivo "
+"backports da Debian desde <literal>squeeze-backports</literal>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:121
@@ -5732,13 +5297,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:132
-#, fuzzy
-#| msgid ""
-#| "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, expect versions coming from archives which "
-#| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
-#| "yes\" - these versions get the priority 1."
 msgid ""
 "If the target release has not been specified then APT simply assigns "
 "priority 100 to all installed package versions and priority 500 to all "
@@ -5751,7 +5309,9 @@ msgstr ""
 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
 "500 e todas as versões de pacotes não instalados, à excepção de versões que "
 "venham de arquivos cujos ficheiros <filename>Release</filename> estejam "
-"marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1."
+"marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1 "
+"ou prioridade 100 se for marcado adicionalmente como \"ButAutomaticUpgrades: "
+"yes\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:139
@@ -6050,7 +5610,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:262
 msgid "Regular expressions and &glob; syntax"
-msgstr ""
+msgstr "Expressões regulares e sintaxe &glob;"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:264
@@ -6061,6 +5621,11 @@ msgid ""
 "gnome (as a &glob;-like expression) or contains the word kde (as a POSIX "
 "extended regular expression surrounded by slashes)."
 msgstr ""
+"O APT também suporta \"pinning\" por expressões &glob;, e expressões "
+"regulares rodeadas por barras. Por exemplo, o seguinte designa a prioridade "
+"de 500 a todos os pacotes de experimental onde o nome começa com gnome (como "
+"uma expressão tipo &glob;) ou contém a palavra kde (como uma expressão "
+"regular extensa do POSIX rodeada de barras)."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:273
@@ -6081,6 +5646,9 @@ msgid ""
 "string can occur. Thus, the following pin assigns the priority 990 to all "
 "packages from a release starting with &ubuntu-codename;."
 msgstr ""
+"A regra para essas expressões é que elas podem ocorrer em qualquer sítio "
+"onde uma string pode ocorrer. Assim, o seguinte pin designa a prioridade 990 "
+"a todos os pacotes de um lançamento que começa com &ubuntu-codename;."
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:285
@@ -6104,6 +5672,13 @@ msgid ""
 "specific pins override it.  The pattern \"<literal>*</literal>\" in a "
 "Package field is not considered a &glob; expression in itself."
 msgstr ""
+"Se ocorrer uma expressão regular num campo <literal>Package</literal>, o "
+"comportamento é o mesmo como se esta expressão regular fosse substituída por "
+"uma lista de todos os nomes de pacotes a que ela coincide. No entanto não "
+"está decidido se isto irá mudar no futuro; assim você deve sempre listar os "
+"pins \"wild-card\" primeiro, para que depois os pins específicos os "
+"sobreporem. O padrão \"<literal>*</literal>\" num campo Package não é "
+"considerado uma expressão &glob; em si próprio."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:307
@@ -6112,18 +5687,13 @@ msgstr "Como o APT Interpreta as Prioridades"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:310
-#, fuzzy
-#| msgid ""
-#| "Priorities (P) assigned in the APT preferences file must be positive or "
-#| "negative integers.  They are interpreted as follows (roughly speaking): "
-#| "<placeholder type=\"variablelist\" id=\"0\"/>"
 msgid ""
 "Priorities (P) assigned in the APT preferences file must be positive or "
 "negative integers.  They are interpreted as follows (roughly speaking):"
 msgstr ""
 "As prioridades (P) atribuídas no ficheiro de preferências do APT têm de ser "
 "inteiros positivos ou negativos. Elas são interpretadas como o seguinte "
-"(falando grosso): <placeholder type=\"variablelist\" id=\"0\"/>"
+"(falando grosso):"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:315
@@ -6320,16 +5890,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:399
-#, fuzzy
-#| msgid ""
-#| "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: <placeholder type="
-#| "\"variablelist\" id=\"0\"/>"
 msgid ""
 "The <filename>Packages</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable>/"
@@ -6346,7 +5906,7 @@ msgstr ""
 "<filename>.../dists/stable/main/binary-i386/Packages</filename>. Consiste "
 "numa série de registos de várias linhas, um para cada pacote disponível "
 "nesse directório. Apenas duas linhas em cada registo são relevantes para "
-"definir prioridades do APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+"definir prioridades do APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:407
@@ -6370,17 +5930,6 @@ msgstr "fornece o número de versão do pacote nomeado"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:417
-#, fuzzy
-#| msgid ""
-#| "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/&stable-codename;/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: <placeholder type=\"variablelist\" id=\"0\"/>"
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6399,7 +5948,7 @@ msgstr ""
 "pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro "
 "<filename>Packages</filename>, quase todas as linhas num ficheiro "
 "<filename>Release</filename> são relevantes para definir as prioridades do "
-"APT: <placeholder type=\"variablelist\" id=\"0\"/>"
+"APT:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:428
@@ -6893,7 +6442,7 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: sources.list.5.xml:33
 msgid "List of configured APT data sources"
-msgstr ""
+msgstr "Lista das fontes de dados APT configuradas"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:38
@@ -6905,6 +6454,12 @@ msgid ""
 "<command>apt-get update</command> (or by an equivalent command from another "
 "APT front-end)."
 msgstr ""
+"A lista de fontes <filename>/etc/apt/sources.list</filename> está desenhada "
+"a suportar qualquer número de fontes activas e uma variedade de meios de "
+"fontes. O ficheiro lista uma fonte por cada linha, com as fontes mais "
+"preferidas listadas primeiro. A informação disponível a partir das fontes "
+"configuradas é obtida pelo <command>apt-get update</command> (ou por um "
+"comando equivalente de outra interface \"front-end\" do APT)."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:45
@@ -6915,6 +6470,11 @@ msgid ""
 "and a <literal>#</literal> character anywhere on a line marks the remainder "
 "of that line as a comment."
 msgstr ""
+"Cada linha que especifica uma fonte começa com o tipo (ex. <literal>deb-src</"
+"literal>) seguido das opções e argumentos para esse tipo. As entradas "
+"individuais não podem ser continuadas para a linha seguinte. As linhas "
+"vazias são ignoradas, e um caracter <literal>#</literal> em qualquer ponto "
+"numa linha marca o restante dessa linha como um comentário."
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:53
@@ -6923,14 +6483,6 @@ msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:54
-#, fuzzy
-#| msgid ""
-#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
-#| "to add sources.list entries in separate files.  The format is the same as "
-#| "for the regular <filename>sources.list</filename> file.  File names need "
-#| "to end with <filename>.list</filename> and may only contain letters (a-z "
-#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
-#| "characters.  Otherwise they will be silently ignored."
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -6946,7 +6498,10 @@ msgstr ""
 "é o mesmo que para o ficheiro <filename>sources.list</filename> regular. Os "
 "nomes de ficheiros precisam acabar com <filename>.list</filename> e apenas "
 "podem conter letras (a-z e A-Z), dígitos (0-9), e os caracteres underscore "
-"(_), menos (-) e ponto (.). De outro modo serão ignorados em silêncio."
+"(_), menos (-) e ponto (.). De outro modo o APT irá escrever um aviso de que "
+"ignorou um ficheiro, a menos que esse ficheiro coincida com um padrão na "
+"lista de configuração <literal>Dir::Ignore-Files-Silently</literal> - que "
+"neste caso serão ignorados em silêncio."
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:65
@@ -6955,17 +6510,6 @@ msgstr "Os tipos deb e deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type references 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."
 msgid ""
 "The <literal>deb</literal> type references a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. The "
@@ -6979,14 +6523,15 @@ msgid ""
 "line is required to fetch source indexes."
 msgstr ""
 "O tipo <literal>deb</literal> descreve um arquivo Debian típico de dois "
-"níveis, <filename>distribution/component</filename>. Tipicamente "
-"<literal>distribution</literal> é geralmente um de <literal>stable</literal> "
-"<literal>unstable</literal> ou <literal>testing</literal> enquanto component "
-"é um de <literal>main</literal> <literal>contrib</literal> <literal>non-"
-"free</literal> ou <literal>non-us</literal>. O tipo <literal>deb-src</"
-"literal> descreve um código fonte de distribuição debian no mesmo formato "
-"que o tipo <literal>deb</literal>. Uma linha <literal>deb-src</literal> é "
-"necessária para obter índices fonte."
+"níveis, <filename>distribution/component</filename>. A "
+"<literal>distribution</literal> é geralmente um nome de arquivo como "
+"<literal>stable</literal> ou <literal>testing</literal> ou um nome de código "
+"como <literal>&stable-codename;</literal> ou <literal>&testing-codename;</"
+"literal> enquanto que componente é um de <literal>main</literal>, "
+"<literal>contrib</literal> ou <literal>non-free</literal>. O tipo "
+"<literal>deb-src</literal> faz referência a um código fonte de distribuição "
+"Debian no mesmo formato que o tipo <literal>deb</literal>. É necessária uma "
+"linha <literal>deb-src</literal> para obter índices das fontes."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:78
@@ -6999,23 +6544,12 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:81
-#, fuzzy, no-wrap
-#| msgid "deb uri distribution [component1] [component2] [...]"
+#, no-wrap
 msgid "deb [ options ] uri distribution [component1] [component2] [...]"
-msgstr "deb uri distribuição [componente1] [componente2] [...]"
+msgstr "deb [ opções ] uri distribuição [componente1] [componente2] [...]"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:83
-#, fuzzy
-#| msgid ""
-#| "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 (<literal>/</literal>). This is useful for the case 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."
 msgid ""
 "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.  "
@@ -7038,14 +6572,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:92
-#, fuzzy
-#| msgid ""
-#| "<literal>distribution</literal> may also contain a variable, <literal>"
-#| "$(ARCH)</literal> which expands to the Debian architecture (i386, amd64, "
-#| "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."
 msgid ""
 "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)"
 "</literal> which expands to the Debian architecture (such as <literal>amd64</"
@@ -7056,12 +6582,12 @@ msgid ""
 "architecture otherwise."
 msgstr ""
 "<literal>distribution</literal> também pode conter uma variável. <literal>"
-"$(ARCH)</literal> a qual se expande à arquitectura Debian (i386, amd64, "
-"powerpc, ...) usada no sistema. Isto permite que seja usados ficheiros "
-"<filename>sources.list</filename> independentes da arquitectura. Em geral, "
-"isto é apenas de interesse quando se especifica um caminho exacto. De outro "
-"modo o <literal>APT</literal> irá gerar automaticamente um URI com a "
-"arquitectura actual."
+"$(ARCH)</literal> a qual se expande à arquitectura Debian (tal como "
+"<literal>amd64</literal> ou <literal>armel</literal>) usada no sistema. Isto "
+"permite que seja usados ficheiros <filename>sources.list</filename> "
+"independentes da arquitectura. Em geral, isto é apenas de interesse quando "
+"se especifica um caminho exacto. De outro modo o <literal>APT</literal> irá "
+"gerar automaticamente um URI com a arquitectura actual."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:100
@@ -7099,6 +6625,12 @@ msgid ""
 "following settings are supported by APT (note however that unsupported "
 "settings will be ignored silently):"
 msgstr ""
+"<literal>options</literal> é sempre opcional e precisa de ser rodeado por "
+"parênteses rectos. Pode consistir um múltiplas definições no formato "
+"<literal><replaceable>setting</replaceable>=<replaceable>value</"
+"replaceable></literal>. As múltiplas definições são separadas por espaços. "
+"As seguinte definições são suportadas pelo APT (no entanto note que as "
+"definições não suportadas serão ignoradas em silêncio):"
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:117
@@ -7109,6 +6641,11 @@ msgid ""
 "architectures defined by the <literal>APT::Architectures</literal> option "
 "will be downloaded."
 msgstr ""
+"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</"
+"replaceable>,…</literal> pode ser usado para especificar para quais "
+"arquitecturas deve ser descarregada a informação. Se esta opção não estiver "
+"definida, serão descarregadas todas as arquitecturas definidas pela opção "
+"<literal>APT::Architectures</literal>."
 
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: sources.list.5.xml:121
@@ -7120,6 +6657,12 @@ msgid ""
 "and trusted context. <literal>trusted=no</literal> is the opposite which "
 "handles even correctly authenticated sources as not authenticated."
 msgstr ""
+"<literal>trusted=yes</literal> pode ser definido para indicar que os pacotes "
+"desta fonte são sempre autênticos mesmo que o ficheiro <filename>Release</"
+"filename> não esteja assinado ou a assinatura não possa ser verificada. Isto "
+"desactiva partes do &apt-secure; e deve por isso ser usado apenas num "
+"contexto local e de confiança. <literal>trusted=no</literal> é o oposto que "
+"lida com fontes mesmo actualmente autenticadas como não sendo autênticas."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:128
@@ -7159,10 +6702,8 @@ msgstr "Especificação da URI"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:143
-#, fuzzy
-#| msgid "more recognizable URI types"
 msgid "The currently recognized URI types are:"
-msgstr "tipos de URI mais reconhecíveis"
+msgstr "Os tipos de URI actualmente reconhecidos são:"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:147
@@ -7204,15 +6745,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:172
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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. "
@@ -7223,22 +6755,17 @@ msgid ""
 "variable. Proxies using HTTP specified in the configuration file will be "
 "ignored."
 msgstr ""
-"O esquema ftp especifica um servidor FTP para o arquivo. o comportamento FTP "
-"do APT é altamente configurável; para mais informação veja o manual &apt-"
-"conf;. Por favor note que um proxy ftp pode ser especificado ao usar a "
-"variável de ambiente <envar>ftp_proxy</envar>. É possível especificar um "
-"proxy http (os servidores de proxy http geralmente compreendem urls de ftp) "
-"usando este método e APENAS este método. Os proxies ftp que usam http e seja "
-"especificados no ficheiro de configuração serão ignorados."
+"O esquema ftp especifica um servidor FTP para o arquivo. O comportamento FTP "
+"do APT é altamente configurável; para mais informação veja o manual do &apt-"
+"conf;. Por favor note que pode ser especificado um proxy FTP ao usar a "
+"variável de ambiente <envar>ftp_proxy</envar>. É possível especifica um "
+"proxy HTTP (os servidores proxy HTTP geralmente compreendem URLs de FTP) "
+"usando esta variável de ambiente e <emphasis>apenas</emphasis> esta variável "
+"de ambiente. Os proxies que usam HTTP especificados no ficheiro de "
+"configuração serão ignorados."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:184
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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.  "
@@ -7247,49 +6774,30 @@ msgid ""
 msgstr ""
 "O esquema copy é idêntico ao esquema file com a excepção que os pacotes são "
 "copiados para o directório cache em vez serem usados directamente da sua "
-"localização. Isto é útil para quem use um disco zip para copiar ficheiros "
-"com o APT."
+"localização. Isto é útil para quem use um meio amovível para copiar "
+"ficheiros com o APT."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:191
-#, fuzzy
-#| msgid ""
-#| "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given "
-#| "user and access the files. It is a good idea to do prior arrangements "
-#| "with RSA keys or rhosts.  Access to files on the remote uses standard "
-#| "<command>find</command> and <command>dd</command> commands to perform the "
-#| "file transfers from the remote."
 msgid ""
 "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
 "the files as a given user. Prior configuration of rhosts or RSA keys is "
 "recommended. The standard <command>find</command> and <command>dd</command> "
 "commands are used to perform the file transfers from the remote host."
 msgstr ""
-"O método rsh/ssh invoca rsh/ssh a ligar a uma máquina remota como um "
-"utilizador fornecido e acede aos ficheiros. É uma boa ideia fazer "
-"preparações prévias com chaves RSA ou rhosts. O acesso a ficheiros remotos "
-"usa os comandos standard <command>find</command> e <command>dd</command> "
-"para executar as transferências de ficheiros remotos."
+"O método rsh/ssh invoca RSH/SSH a ligar a uma máquina remota e aceder a "
+"ficheiros como um dado utilizador. É recomendada a configuração prévia de "
+"rhosts ou chaves RSA. Os comandos standard <command>find</command> e "
+"<command>dd</command> são usados para executar as transferências de "
+"ficheiros a partir da máquina remota."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml:198
-#, fuzzy
-#| msgid "more recognizable URI types"
 msgid "adding more recognizable URI types"
-msgstr "tipos de URI mais reconhecíveis"
+msgstr "adicionando mais tipos de URI reconhecíveis"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:200
-#, fuzzy
-#| msgid ""
-#| "APT can be extended with more methods shipped in other optional packages "
-#| "which should follow the nameing scheme <literal>apt-transport-"
-#| "<replaceable>method</replaceable></literal>.  The APT team e.g. maintains "
-#| "also the <literal>apt-transport-https</literal> package which provides "
-#| "access methods for https-URIs with features similar to the http method, "
-#| "but other methods for using e.g. debtorrent are also available, see "
-#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
-#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
 msgid ""
 "APT can be extended with more methods shipped in other optional packages, "
 "which should follow the naming scheme <package>apt-transport-"
@@ -7300,14 +6808,12 @@ msgid ""
 "transport-debtorrent;."
 msgstr ""
 "O APT pode ser estendido com mais métodos lançados em outros pacotes "
-"opcionais que devem seguir o esquema de nomeação <literal>apt-transport-"
-"<replaceable>método</replaceable></literal>. A equipa do APT, por exemplo, "
-"mantém também o pacote <literal>apt-transport-https</literal> que "
-"disponibiliza métodos de acesso para URIs https com funcionalidades "
-"semelhantes ao método http, mas estão também disponíveis outros métodos para "
-"usar por exemplo o debtorrent, veja <citerefentry> "
-"<refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> "
-"<manvolnum>1</manvolnum></citerefentry>."
+"opcionais, que devem seguir o esquema de nomeação <literal>apt-transport-"
+"<replaceable>método</replaceable></literal>. Por exemplo, a equipa do APT "
+"também mantém o pacote <package>apt-transport-https</package>, o qual "
+"disponibiliza métodos de acesso para URIs HTTPS com funcionalidades "
+"semelhantes ao método http. Estão também disponíveis métodos para usar por "
+"exemplo o debtorrent - veja &apt-transport-debtorrent;."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:212
@@ -7354,6 +6860,9 @@ msgid ""
 "<literal>APT::Architectures</literal> while the second always retrieves "
 "<literal>amd64</literal> and <literal>armel</literal>."
 msgstr ""
+"A primeira linha obtém a informação do pacote para a arquitectura em "
+"<literal>APT::Architectures</literal> enquanto a segunda obtém sempre "
+"<literal>amd64</literal> e <literal>armel</literal>."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:224
@@ -7422,14 +6931,6 @@ msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:241
-#, fuzzy
-#| msgid ""
-#| "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-"
-#| "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 structured like this]"
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -7439,12 +6940,13 @@ msgid ""
 "archives are not structured like this] <placeholder type=\"literallayout\" "
 "id=\"0\"/>"
 msgstr ""
-"Usa HTTP para aceder ao arquivo em nonus.debian.org, sob o directório debian-"
-"non-US, e usa apenas os ficheiros encontrados sob <filename>unstable/binary-"
-"i386</filename> em máquinas i386, <filename>unstable/binary-m68k</filename> "
-"em m68k, e assim por diante para outras arquitecturas suportadas. [Note que "
-"este exemplo apenas mostra como usar a variável de substituição; non-us já "
-"não é mais estruturado desta maneira]"
+"Usa HTTP para aceder ao arquivo em ftp.tlh.debian.org, sob o directório "
+"universe, e usa apenas os ficheiros encontrados sob <filename>unstable/"
+"binary-i386</filename> em máquinas i386, <filename>unstable/binary-amd64</"
+"filename> em amd64, e assim por diante para outras arquitecturas suportadas. "
+"[Note que este exemplo apenas mostra como usar a variável de substituição; "
+"os arquivos oficiais debian não estão estruturados assim] <placeholder type="
+"\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:253
@@ -7540,13 +7042,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-sortpkgs.1.xml:45
-#, fuzzy
-#| msgid "All output is sent to stdout, the input must be a seekable file."
 msgid ""
 "All output is sent to standard output; the input must be a seekable file."
 msgstr ""
-"Todas as saídas são enviadas para o stdout, a entrada tem de ser um ficheiro "
-"pesquisável."
+"Todas as saídas são enviadas para a saída standard, a entrada tem de ser um "
+"ficheiro pesquisável."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-sortpkgs.1.xml:54
@@ -7692,6 +7192,15 @@ msgid ""
 "literal>.  It then writes to stdout a <filename>Release</filename> file "
 "containing an MD5, SHA1 and SHA256 digest for each file."
 msgstr ""
+"O comando <literal>release</literal> gera um ficheiro Release a partir de "
+"uma árvore de directórios. Por predefinição, procura recursivamente no "
+"directório fornecido por ficheiros <filename>Packages</filename> e "
+"<filename>Sources</filename> não comprimidos e outros comprimidos com "
+"<command>gzip</command>, <command>bzip2</command> ou <command>lzma</command> "
+"assim como ficheiros <filename>Release</filename> e <filename>md5sum.txt</"
+"filename> (<literal>APT::FTPArchive::Release::Default-Patterns</literal>). "
+"Depois escreve para o stdout um ficheiro <filename>Release</filename> que "
+"contém um resultado de MD5, SHA1 e SHA256 para cada ficheiro."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:104
@@ -7772,10 +7281,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:144
-#, fuzzy
-#| msgid "the <literal>Origin:</literal> line"
 msgid "<literal>Dir</literal> Section"
-msgstr "a linha <literal>Origin:</literal>"
+msgstr "Secção <literal>Dir</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:146
@@ -7821,10 +7328,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:176
-#, fuzzy
-#| msgid "the <literal>Label:</literal> line"
 msgid "<literal>Default</literal> Section"
-msgstr "a linha <literal>Label:</literal>"
+msgstr "Secção <literal>Default</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:178
@@ -7929,10 +7434,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:242
-#, fuzzy
-#| msgid "the <literal>Label:</literal> line"
 msgid "<literal>TreeDefault</literal> Section"
-msgstr "a linha <literal>Label:</literal>"
+msgstr "Secção <literal>TreeDefault</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:244
@@ -8088,10 +7591,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:342
-#, fuzzy
-#| msgid "the <literal>Label:</literal> line"
 msgid "<literal>Tree</literal> Section"
-msgstr "a linha <literal>Label:</literal>"
+msgstr "Secção <literal>Tree</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:344
@@ -8209,10 +7710,8 @@ msgstr "Define o ficheiro de sobreposição extra fonte."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:410
-#, fuzzy
-#| msgid "BinDirectory Section"
 msgid "<literal>BinDirectory</literal> Section"
-msgstr "Secção BinDirectory"
+msgstr "Secção <literal>BinDirectory</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:412
@@ -8356,16 +7855,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:510
-#, fuzzy
-#| msgid ""
-#| "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>Valid-"
-#| "Until</literal>, <literal>Architectures</literal>, <literal>Components</"
-#| "literal>, <literal>Description</literal>."
 msgid ""
 "Generate the given checksum. These options default to on, when turned off "
 "the generated index files will not have the checksum fields where possible.  "
@@ -8377,14 +7866,16 @@ msgid ""
 "literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
 "<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
 msgstr ""
-"Valores para os campos de metadados adicionais no ficheiro Release são "
-"tomados a partir das variáveis correspondentes sob <literal>APT::FTPArchive::"
-"Release</literal>, ex. <literal>APT::FTPArchive::Release::Origin</literal>.  "
-"Os campos suportados são: <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>."
+"Gera o sumário de verificação dado. Estas opções usam a predefinição de "
+"ligadas, quando são desligadas os ficheiros de índice gerados não terão os "
+"campos de sumário de verificação onde tal for possível Items de "
+"Configuração: <literal>APT::FTPArchive::<replaceable>Checksum</replaceable></"
+"literal> e <literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
+"<replaceable>Checksum</replaceable></literal> onde "
+"<literal><replaceable>Index</replaceable></literal> pode ser "
+"<literal>Packages</literal>, <literal>Sources</literal> ou <literal>Release</"
+"literal> e o <literal><replaceable>Checksum</replaceable></literal> pode ser "
+"<literal>MD5</literal>, <literal>SHA1</literal> ou <literal>SHA256</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:521
diff --git a/po/ar.po b/po/ar.po
index 04c1e39c0..d22b4c7c9 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,20 +7,17 @@ msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:14+0000\n"
+"PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
-"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
-"X-Poedit-Country: Lebanon\n"
 "X-Poedit-Language: Arabic\n"
+"X-Poedit-Country: Lebanon\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -29,55 +26,58 @@ msgstr "الحزمة %s النسخة %s لها معتمد غير مستوفى:\n
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "أسماء الحزم الكلية : "
+msgstr "أسماء الحزم الكلية :"
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "أسماء الحزم الكلية :"
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  الحزم العادية: "
+msgstr " الحزم العادية:"
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  الحزمة الوهمية تماماً: "
+msgstr "الحزمة الوهمية تماماً:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  الحزمة الوهمية المفردة: "
+msgstr " الحزمة الوهمية المفردة:"
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  الحزم الوهمية المختلطة: "
+msgstr " الحزم الوهمية المختلطة:"
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  مفقودة: "
+msgstr " مفقودة:"
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "مجموع النسخ الفريدة: "
+msgstr "مجموع النسخ الفريدة:"
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "مجموع النسخ الفريدة:"
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "مجموع المعتمدات: "
+msgstr "مجموع المعتمدات:"
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "مجموع علاقات النسخ/الملفات: "
+msgstr "مجموع علاقات النسخ/الملفات:"
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "مجموع علاقات النسخ/الملفات:"
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "مجموع علاقات النسخ/الملفات: "
+msgstr "مجموع علاقات النسخ/الملفات:"
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
@@ -93,7 +93,7 @@ msgstr ""
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "مجموع المساحة المحسوب حسابها: "
+msgstr "مجموع المساحة المحسوب حسابها:"
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -107,8 +107,9 @@ msgid "No packages found"
 msgstr "لم يُعثر على أية حزم"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "يجب أن تعطي صيغة واحدة بالضبط"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -138,7 +139,7 @@ msgstr "(غير موجود)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  مُثبّت: "
+msgstr " مُثبّت:"
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
@@ -155,15 +156,15 @@ msgstr ""
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
-msgstr "  جدول النسخ:"
+msgstr " جدول النسخ:"
 
 #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
 msgid ""
@@ -203,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "الرجاء كتابة اسم لهذا القرص، مثال 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "الرجاء إدخال قرص في السواقة وضغط الزر enter"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "فشل تغيير اسم %s إلى %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -326,7 +328,7 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً، "
+msgstr "%lu سيتم ترقيتها، %lu مثبتة حديثاً،  "
 
 #: cmdline/apt-get.cc:606
 #, c-format
@@ -349,14 +351,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu غير مثبتة بالكامل أو مزالة.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -388,9 +390,9 @@ msgid "However the following packages replace it:"
 msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "الحزمة %s ليس لها مرشح تثبيت"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -399,19 +401,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -419,9 +421,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -434,19 +436,19 @@ msgid "%s is already the newest version.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "إلا أنه سيتم تثبيت %s"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -529,16 +531,16 @@ msgstr "بحاجة إلى جلب %sب من الأرشيف.\n"
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "بعد الاستخراج %sب من المساحة الإضافيّة سيتمّ استخدامها.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
@@ -576,7 +578,7 @@ msgstr "إجهاض."
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "هل تريد الاستمرار [Y/n]؟ "
+msgstr "هل تريد الاستمرار [Y/n]؟"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -670,25 +672,27 @@ msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
+msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "سيتم تثبيت الحزم الجديدة التالية:"
+msgstr[1] "سيتم تثبيت الحزم الجديدة التالية:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -741,9 +745,9 @@ msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "إلا أنه سيتم تثبيت %s"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -753,7 +757,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "حساب الترقية... "
+msgstr "حساب الترقية..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -931,9 +935,9 @@ msgid "Failed to process build dependencies"
 msgstr ""
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "الاتصال بـ%s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
@@ -1003,11 +1007,11 @@ msgstr "جلب:"
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "تجاهل "
+msgstr "تجاهل"
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "خطأ "
+msgstr "خطأ"
 
 #: cmdline/acqprogress.cc:140
 #, c-format
@@ -1031,29 +1035,29 @@ msgstr ""
 "في السوّاقة '%s' وضغط مفتاح الإدخال\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "إلا أنها غير مثبتة"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "إلا أنه سيتم تثبيت %s"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "إلا أنه سيتم تثبيت %s"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s هي النسخة الأحدث.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s هي النسخة الأحدث.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1062,14 +1066,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "إلا أنه سيتم تثبيت %s"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "فشل فتح %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1343,9 +1347,9 @@ msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "تعذر الاتصال بـ%s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1475,9 +1479,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "فشل إغلاق الملف %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1520,12 +1524,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "حدثت بعض الأخطاء أثناء فك الحزمة. سأقوم بتهيئة "
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "الحزم التي تم تثبيتها. قد يتسبب هذا بظهر أخطاء متكررة"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1875,7 +1881,7 @@ msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "فشل تنفيذ gzip "
+msgstr "فشل تنفيذ gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -1899,9 +1905,9 @@ msgid "Error reading archive member header"
 msgstr ""
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "توقيع الأرشيف غير صالح"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2038,17 +2044,19 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "تعذر التغيير إلى %s"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "تعذر فتح %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "تعذر إرسال الأمر PORT"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2056,8 +2064,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "فشلت كتابة الملف %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2228,9 +2237,9 @@ msgid "Failed to stat the cdrom"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "مشكلة في إغلاق الملف"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2299,9 +2308,9 @@ msgid "Could not open file %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "فشل إغلاق الملف %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2322,19 +2331,19 @@ msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "مشكلة في إغلاق الملف"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "مشكلة في مزامنة الملف"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "مشكلة في إغلاق الملف"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2434,18 +2443,19 @@ msgid "Dependency generation"
 msgstr ""
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "دمج المعلومات المتوفرة"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "فشل فتح %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "فشلت كتابة الملف %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2535,9 +2545,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "فشل إغلاق الملف %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2585,9 +2595,9 @@ msgid "Archives directory %spartial is missing."
 msgstr ""
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "تعذر قفل دليل القائمة"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2681,9 +2691,9 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2735,8 +2745,9 @@ msgstr "MD5Sum غير متطابقة"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "MD5Sum غير متطابقة"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2746,9 +2757,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2804,14 +2815,14 @@ msgid "Size mismatch"
 msgstr "الحجم غير متطابق"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2819,14 +2830,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "تعذر فتح ملف قاعدة البيانات %s: %s"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2842,7 +2853,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "جاري التعرف... "
+msgstr "جاري التعرف..."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
@@ -2850,8 +2861,9 @@ msgid "Stored label: %s\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "فك تركيب القرص المدمج..."
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -2943,9 +2955,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "MD5Sum غير متطابقة"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -2954,9 +2966,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "إجهاض التثبيت."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -2969,14 +2981,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "تعذر العثور على الحزمة %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "تعذر العثور على الحزمة %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3026,9 +3038,9 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "تم تثبيت %s"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
@@ -3041,9 +3053,9 @@ msgid "Removing %s"
 msgstr "إزالة %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "تمت إزالة %s بالكامل"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3062,9 +3074,9 @@ msgid "Directory '%s' missing"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "فشل إغلاق الملف %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3164,9 +3176,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "تعذر قفل دليل القائمة"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3180,32 +3192,103 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "فشل العثور على ملف تحكّم صالح"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "فتح ملف التهيئة %s"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "تعذر التغيير إلى %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "تعذرت إزالة %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "خطأ داخلي أثناء الحصول على node"
+#~ msgid "Unable to create %s"
+#~ msgstr "تعذر إنشاء %s"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "فشلت قراءة ملف القائمة %sinfo/%s"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
+
+#~ msgid "Internal error getting a package name"
+#~ msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة"
 
 #~ msgid "Reading file listing"
 #~ msgstr "قراءة سرد الملفات"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "خطأ داخلي أثناء الحصول على اسم الحزمة"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "فشلت قراءة ملف القائمة %sinfo/%s"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "فشل تغيير دليل الإدارة إلى %sinfo"
+#~ msgid "Internal error getting a node"
+#~ msgstr "خطأ داخلي أثناء الحصول على node"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "تعذر إنشاء %s"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "تعذر التغيير إلى %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "تعذرت إزالة %s"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "فشل العثور على ملف تحكّم صالح"
+
+#, fuzzy
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "فشل إغلاق الملف %s"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (UserPackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (UserPackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "خطأ داخلي، تعذر العثور على العضو"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewVersion2)"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "خطأ في معالجة الدليل %s"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "السطر %d طويل جداً (أقصاه %d)"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "السطر %d طويل جداً (أقصاه %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "حدث خطأ أثناء معالجة %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "فشل التحديد"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
+#~ msgid "File date has changed %s"
+#~ msgstr "تغير تاريخ الملف %s"
diff --git a/po/ast.po b/po/ast.po
index 8d34f9f16..99b422973 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -5,16 +5,15 @@ msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
-"Last-Translator: Marcos Alvarez Costales <Unknown>\n"
+"PO-Revision-Date: 2010-10-02 23:35+0100\n"
+"Last-Translator: Iñigo Varela <ivarela@softastur.org>\n"
 "Language-Team: Asturian (ast)\n"
 "Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: Virtaal 0.5.2\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -102,7 +101,7 @@ msgstr "Nun s'alcontraron paquetes"
 
 #: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
-msgstr "Has dar polo menos un patrón de gueta"
+msgstr "Has de dar polo menos un patrón de gueta"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -161,6 +160,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pa %s compiláu en %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -196,6 +196,44 @@ 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 ""
+"Usu: apt-cache [opciones] orde\n"
+"     apt-cache [opciones] add ficheru1 [ficheru2 ...]\n"
+"     apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
+"     apt-cache [opciones] showsrc paq1 [paq2 ...]\n"
+"\n"
+"apt-cache ye una ferramienta de baxu nivel usada pa remanar\n"
+"ficheros de caché binarios d'APT y consultar información d'ellos\n"
+"\n"
+"Ordes:\n"
+"   add - Amesta un ficheru de paquete a la caché fonte\n"
+"   gencaches - Creal dambes cachés, la de paquetes y la de fontes\n"
+"   showpkg - Amuesa algo d'información xeneral d'un sólu paquete\n"
+"   showsrc - Amuesa los rexistros de fonte\n"
+"   stats - Amuesa dalgunes estadístiques básiques\n"
+"   dump - Amuesa'l ficheru ensembre en formatu tersu\n"
+"   dumpavail - Imprenta un ficheru disponible na salida estándar\n"
+"   unmet - Amuesa dependencies nun atopáes\n"
+"   search - Restola na llista de paquetes por el patrón d'una espresión "
+"regular\n"
+"   show - Amuesa un rexistru lleíble pal paquete\n"
+"   showauto - Amouesa una llista de paquetes instalaos automáticamente\n"
+"   depends - Amuesa la información de dependencies en bruto d'un paquete\n"
+"   rdepends - Amuesa la información de dependencies inverses d'un paquete\n"
+"   pkgnames - Llista los nomes de tolos paquetes nel sistema\n"
+"   dotty - Xenera gráfiques del paquete pa GraphViz\n"
+"   xvcg - Xenera gráfiques del paquete pa xvcg\n"
+"   policy - Amuesa los axustes de les normes\n"
+"\n"
+"Opciones:\n"
+"  -h   Esti testu d'aida.\n"
+"  -p=? La cache de paquetes.\n"
+"  -s=? La cache de fontes.\n"
+"  -q   Desactiva l'indicador de progresu.\n"
+"  -i   Amuesa sólo les dependencies importantes de la orde incumplida.\n"
+"  -c=? Lleer esti ficheru de configuración\n"
+"  -o=? Conseña una opción de configuración arbitraria, ex -o dir::cache=/"
+"tmp\n"
+"Ver les páxines del manual apt-cache(8) y apt.conf(5) pa más información.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -303,11 +341,11 @@ msgstr "Los siguientes paquetes van DESANICIASE:"
 
 #: cmdline/apt-get.cc:446
 msgid "The following packages have been kept back:"
-msgstr "Los siguientes paquetes tán reteníos:"
+msgstr "Los siguientes paquetes tan reteníos:"
 
 #: cmdline/apt-get.cc:467
 msgid "The following packages will be upgraded:"
-msgstr "Van anovase los siguientes paquetes:"
+msgstr "Los siguientes paquetes van actualizase:"
 
 #: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
@@ -333,7 +371,7 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu anovaos, %lu nuevos instalaos, "
+msgstr "%lu actualizaos, %lu nuevos instalaos, "
 
 #: cmdline/apt-get.cc:606
 #, c-format
@@ -348,7 +386,7 @@ msgstr "%lu desactualizaos, "
 #: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu pa desaniciar y %lu non anovaos.\n"
+msgstr "%lu para desaniciar y %lu nun actualizaos.\n"
 
 #: cmdline/apt-get.cc:614
 #, c-format
@@ -395,7 +433,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:700
 msgid "However the following packages replace it:"
-msgstr "Sicasí, los siguientes paquetes tróquenlu:"
+msgstr "Sicasí, los siguientes paquetes reemplacenlu:"
 
 #: cmdline/apt-get.cc:712
 #, c-format
@@ -409,14 +447,14 @@ msgstr "Los paquetes virtuales como '%s' nun pueden desaniciase\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -426,7 +464,7 @@ msgstr "Nota, escoyendo %s nel llugar de %s\n"
 #: cmdline/apt-get.cc:818
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Saltando %s, yá ta instaláu y l'anovamientu nun ta activáu.\n"
+msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
 
 #: cmdline/apt-get.cc:822
 #, c-format
@@ -454,9 +492,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Esbillada la versión %s (%s) pa %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Esbillada la versión %s (%s) pa %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -480,7 +518,7 @@ msgstr " Fecho"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Habríes d'executar 'apt-get -f install' pa igualo."
+msgstr "Habríes d'executar 'apt-get -f install' para igualo."
 
 #: cmdline/apt-get.cc:1043
 msgid "Unmet dependencies. Try using -f."
@@ -527,14 +565,14 @@ msgstr "Que raro.. Los tamaños nun concasen, escribe a apt@packages.debian.org"
 #: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Necesiten descargase %sB/%sB d'archivos.\n"
+msgstr "Hai que descargar %sB/%sB d'archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1201
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "Necesiten descargase %sB d'archivos.\n"
+msgstr "Hai que descargar %sB d'archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -629,11 +667,11 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"El siguiente paquete desapareció del sistema y\n"
-"sobrescribiéronse tolos ficheros por otros paquetes:"
+"El siguiente paquete desapareció del sistema como\n"
+"tolos ficheros fueron sobroescritos por otros paquetes:"
 msgstr[1] ""
-"Los siguientes paquetes desaparecieron del sistema y\n"
-"sobrescribiéronse tolos ficheros por otros paquetes:"
+"Los siguientes paquetes desaparecieron del sistema como\n"
+"tolos ficheros fueron sobroescritos por otros paquetes:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -647,7 +685,7 @@ msgstr "Inorar release destín non disponible '%s' pal paquete '%s'"
 #: cmdline/apt-get.cc:1591
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Tomando '%s' como paquete d'oríxenes en llugar de '%s'\n"
+msgstr "Tomando '%s' como paquetes d'oríxenes en llugar de '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -661,8 +699,7 @@ msgstr "La orde update nun lleva argumentos"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Entiéndese que nun vamos desaniciar coses, nun pue entamase «AutoRemover»"
+msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
 
 #: cmdline/apt-get.cc:1815
 msgid ""
@@ -670,7 +707,7 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 "Hmm, paez que AutoRemover destruyó daqué, lo que nun tendría\n"
-"por qué pasar. Por favor, unvia un informe de fallu escontra apt."
+"por qué pasar. Por favor, unvía un informe de fallu escontra apt."
 
 #.
 #. if (Packages == 1)
@@ -684,11 +721,11 @@ msgstr ""
 #.
 #: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
 msgid "The following information may help to resolve the situation:"
-msgstr "La siguiente información pue ayudar a resolver la situación:"
+msgstr "La siguiente información pue aidar a resolver la situación:"
 
 #: cmdline/apt-get.cc:1822
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Error internu, «AutoRemover» frañó coses"
+msgstr "Error internu, AutoRemover rompió coses"
 
 #: cmdline/apt-get.cc:1829
 msgid ""
@@ -698,7 +735,8 @@ msgid_plural ""
 "required:"
 msgstr[0] "El siguiente paquete instalóse mou automáticu y yá nun se necesita:"
 msgstr[1] ""
-"Los siguientes paquetes instaláronse de mou automáticu y yá nun se necesiten:"
+"Los siguientes paquetes instaláronse de manera automática y ya nun se "
+"necesiten:"
 
 #: cmdline/apt-get.cc:1833
 #, c-format
@@ -710,25 +748,26 @@ msgstr[1] ""
 "Los paquetes %lu instaláronse de manera automática y ya nun se necesiten\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Usa 'apt-get autoremove' pa desinstalalos."
+msgstr[1] "Usa 'apt-get autoremove' pa desinstalalos."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Error Internu, AllUpgrade frañó coses"
+msgstr "Error internu, AllUpgrade rompió coses"
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Tendríes d'executar 'apt-get -f install' pa correxir esto:"
+msgstr "Habríes d'executar 'apt-get -f install' para iguar estos:"
 
 #: cmdline/apt-get.cc:1957
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Dependencies ensin cubrir. Intenta 'apt-get -f install' ensin paquetes (o "
+"Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseña una solución)."
 
 #: cmdline/apt-get.cc:1972
@@ -738,9 +777,9 @@ msgid ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"Nun pudieron instalase dellos paquetes. Esto pue significar que\n"
-"conseñasti una situación imposible o, si tas usando la distribución\n"
-"inestable, que nun se crearon dellos paquetes necesarios o que\n"
+"Dellos paquetes nun pudieron instalase. Esto puede significar que\n"
+"conseñaste una situación imposible o, si tas usando la distribución\n"
+"inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
 #: cmdline/apt-get.cc:1993
@@ -749,11 +788,11 @@ msgstr "Paquetes frañaos"
 
 #: cmdline/apt-get.cc:2019
 msgid "The following extra packages will be installed:"
-msgstr "Van instalase los siguientes paquetes estra:"
+msgstr "Instalaránse los siguientes paquetes extra:"
 
 #: cmdline/apt-get.cc:2109
 msgid "Suggested packages:"
-msgstr "Paquetes suxeríos:"
+msgstr "Paquetes afalaos:"
 
 #: cmdline/apt-get.cc:2110
 msgid "Recommended packages:"
@@ -767,7 +806,7 @@ msgstr "Nun pudo alcontrase'l paquete %s"
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s afitáu pa instalación automática.\n"
+msgstr "%s axustáu como instaláu automáticamente.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -793,7 +832,7 @@ msgstr "Error internu, l'iguador de problemes frañó coses"
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
-msgstr "Nun pue bloquiase'l direutoriu de descargues"
+msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
 #: cmdline/apt-get.cc:2386
 #, c-format
@@ -807,12 +846,12 @@ msgstr "Descargando %s %s"
 
 #: cmdline/apt-get.cc:2451
 msgid "Must specify at least one package to fetch source for"
-msgstr "Has conseñar polo menos un paquete p'algamar el so códigu fonte"
+msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
 
 #: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "Nun pudo alcontrase un paquete de fontes pa %s"
+msgstr "Nun pudo alcontrase un paquete fonte pa %s"
 
 #: cmdline/apt-get.cc:2508
 #, c-format
@@ -820,17 +859,20 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"AVISU: l'empaquetáu de «%s» caltiénse col sistema de control de versiones "
-"«%s» en:\n"
+"AVISU: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Por favor, usa:\n"
+"bzr get %s\n"
+"pa baxar los caberos anovamientos (posiblemente tovía nun sacaos) pal "
+"paquete.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -847,14 +889,14 @@ msgstr "Nun hai espaciu llibre bastante en %s"
 #: cmdline/apt-get.cc:2612
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Fai falta descargar %sB/%sB d'archivos fonte.\n"
+msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:2617
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Fai falta descargar %sB d'archivos fonte.\n"
+msgstr "Hai falta descargar %sB d'archivos fonte.\n"
 
 #: cmdline/apt-get.cc:2623
 #, c-format
@@ -878,7 +920,7 @@ msgstr "Falló la orde de desempaquetáu '%s'.\n"
 #: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Comprueba que'l paquete 'dpkg-dev' ta instaláu.\n"
+msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
 #: cmdline/apt-get.cc:2727
 #, c-format
@@ -887,12 +929,12 @@ msgstr "Falló la orde build '%s'.\n"
 
 #: cmdline/apt-get.cc:2747
 msgid "Child process failed"
-msgstr "Falló'l procesu fíu"
+msgstr "Falló el procesu fíu"
 
 #: cmdline/apt-get.cc:2766
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
-"Hai de conseñar polo menos un paquete pa verificar les dependencies de "
+"Hai que conseñar polo menos un paquete pa verificar les dependencies de "
 "construcción"
 
 #: cmdline/apt-get.cc:2791
@@ -913,11 +955,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcción.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -936,18 +980,22 @@ msgstr ""
 "enforma nuevu"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque denguna versión "
+"disponible del paquete %s satisfaz los requisitos de versión"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
+"paquete %s"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -964,15 +1012,16 @@ msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Rexistru de cambeos de %s (%s)"
+msgstr "Coneutando a %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1017,6 +1066,50 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Usu: apt-get [opciones] comandu\n"
+"       apt-get [opciones] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [opciones] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get ye una interface de llínia de comandos simple pa baxar ya\n"
+"instalar paquetes. L'usu más frecuente de comandos ye p'anovar\n"
+"ya instalar.\n"
+"\n"
+"Comandos:\n"
+"   update - Algamar nueva llista de paquetes\n"
+"   upgrade - Facer una anovación\n"
+"   install - Instalar nuevos paquetes (pkg ye libc6 non libc6.deb)\n"
+"   remove - Desaniciar paquetes\n"
+"   autoremove - Desaniciar automáticamente tolos paquetes non usaos\n"
+"   purge - Quitar y desaniciar paquetes\n"
+"   source - Baxar fonte del ficheru\n"
+"   build-dep - Configurar dependencies pa los paquetes fonte\n"
+"   dist-upgrade - Actualización de la distribución, ver apt-get(8)\n"
+"   dselect-upgrade - Siguir seleiciones dselect\n"
+"   clean - Esborrar los ficheros de ficheros baxaos\n"
+"   autoclean - Esborrar ficheros de ficheros vieyos baxaos\n"
+"   check - Verificar que nun hai dependencies frayaes\n"
+"   markauto - Marcar paquetes como automáticamente instalaos\n"
+"   unmarkauto - Marcar paquetes como manualmente instalaos\n"
+"\n"
+"Opciones:\n"
+"  -h  Esti testu d'aida.\n"
+"  -q  Salida Log - ensín indicación de progresu\n"
+"  -qq Ensín salida excepto pa fallos\n"
+"  -d  Baxar sólo - NON instalar o desempaquetar los archivos\n"
+"  -s  Non aición. Facer una simulación ordenada\n"
+"  -y  Asumir Yes pa toles entruges y nun visualizar la petición\n"
+"  -f  Intentar correxir un sistema con dependencies frayaes\n"
+"  -m  Intentar siguir si los archivos nun tan disponibles\n"
+"  -u  Amosar una lilsta de paquetes que tan bien\n"
+"  -b  Facer el paquete fonte dempues d'algamalu\n"
+"  -V  Amosar númberos de versiones\n"
+"  -c=? Lleer esti ficheru de configuración\n"
+"  -o=? Afitar una opción de configuración arbitraria, p. ex. -o dir::cache=/"
+"tmp\n"
+"Ver lés páxines de los manuales d' apt-get(8), sources.list(5) y apt.conf"
+"(5)\n"
+"pa más información y opciones.\n"
+"                       Esti APT tien Poderes de Super Vaca.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1028,7 +1121,8 @@ msgstr ""
 "NOTA: ¡Esto sólo ye una simulación!\n"
 "       apt-get necesita privilexos de root pa la execución real.\n"
 "       ¡Ten tamién en cuenta que'l bloquéu ta desactiváu,\n"
-"       asina que nun dependen de la relevancia de la situación real actual!"
+"       asina que nun dependen de la pertinencia de la verdadera situación "
+"actual!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1068,29 +1162,29 @@ msgstr ""
 "na unidá '%s' y calca Intro\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "pero nun ta instaláu"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s axustáu como instaláu manualmente.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s axustáu como instaláu automáticamente.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s yá ta na versión más nueva.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s yá ta na versión más nueva.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1099,14 +1193,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero nun taba ellí"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s axustáu como instaláu manualmente.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Nun pudo abrise %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1510,14 +1604,14 @@ msgstr "Nun se pudo cambiar a %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Nun s'alcontró ficheru espeyu '%s' "
+msgstr "Nun s'alcontró ficheru espeyu '%s'"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Nun s'alcontró ficheru espeyu '%s'"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1544,7 +1638,7 @@ msgstr ""
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Falló crear un tubu IPC al soprocesu"
+msgstr "Falló criar un tubu IPC al soprocesu"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
@@ -1874,19 +1968,19 @@ msgid "Unable to open %s"
 msgstr "Nun pudo abrise %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Saltu mal formáu %s llinia %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Saltu mal formáu %s llinia %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Saltu mal formáu %s llinia %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1905,7 +1999,7 @@ msgstr "La salida comprimida %s necesita un xuegu de compresión"
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
-msgstr "Nun pudo crease FICHERU*"
+msgstr "Nun pudo criase FICHERU*"
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
@@ -1918,7 +2012,7 @@ msgstr "Comprimir fíu"
 #: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "Error internu, nun pudo crease %s"
+msgstr "Error internu, nun pudo criase %s"
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
@@ -1939,6 +2033,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Nun pudo renomase %s como %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1951,6 +2046,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Usu: apt-extracttemplates ficheru1 [ficheru2 ...]\n"
+"\n"
+"apt-extracttemplates ye un preséu pa sacar información de\n"
+"configuración y plantíes de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"-h Esti testu d'aida.\n"
+"-t Define'l direutoriu temporal\n"
+"-c=? Llei esti ficheru de configuración\n"
+"-o=? Afita una opción de configuración arbitraria, p. ej. -o dir::cache=/"
+"tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2017,7 +2123,7 @@ msgstr "Testera de miembru del archivu %s inválida"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
-msgstr "Testera de miembru del archivu inválida"
+msgstr "Testera de miembru del ficheru inválida"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
@@ -2150,9 +2256,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Nun pudo duplicase'l ficheru descriptor %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Nun se pudo facer mmap de %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2160,7 +2266,7 @@ msgstr "Nun pudo zarrase mmap"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr "Nun se pudo sincronizase mmap"
+msgstr "Nun se pudo sincronizase mmap "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2186,13 +2292,13 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
-"Nun pudo incrementase'l tamañu de MMap col llímite de %lu bytes yá torgáu"
+"Nun pudó incrementase'l tamañu de MMap col llímite de %lu bytes ya torgáu"
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
-"Nun pudo incrementase'l tamañu de MMap yá que crecer automáticamente ta "
+"Nun pudó incrementase'l tamañu de MMap ya que crecer automáticamente ta "
 "desactivao pol usuariu."
 
 #. d means days, h means hours, min means minutes, s means seconds
@@ -2425,21 +2531,21 @@ msgstr "Nun pudo abrise un ficheru descriptor %d"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
-msgstr "Nun pudo crease'l soprocesu IPC"
+msgstr "Nun pudo criase'l soprocesu IPC"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
 msgstr "Nun pudo executase'l compresor "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2473,8 +2579,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "El ficheru de caché de paquetes ye una versión incompatible"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "El ficheru de caché de paquetes ta tollíu"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2656,13 +2763,13 @@ msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"Nun pudo facese la configuración inmediatamente en '%s'. Por favor, mira man "
+"Nun pudó facese la configuración inmediatamente en '%s'. Por favor, mira man "
 "5 apt.conf embaxo APT::Immediate-Configure for details. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Nun pudo abrise'l ficheru '%s'"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2700,10 +2807,13 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nun pueden iguase los problemes; tienes paquetes frañaos reteníos."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Nun pudieron descargase dellos ficheros d'índiz; inoráronse o usáronse los "
+"antiguos nel so llugar."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2814,9 +2924,9 @@ msgstr "La caché tien un sistema de versiones incompatible"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Hebo un error al procesar %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2880,9 +2990,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Nun se pudo parchear el ficheru release %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3330,7 +3440,7 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
-"Nun pudo bloquiase'l direutoriu d'alministración (%s), ¿hai otru procesu "
+"Nun pudó bloquease'l direutoriu d'alministración (%s), ¿hai otru procesu "
 "usándolu?"
 
 #: apt-pkg/deb/debsystem.cc:87
@@ -3352,16 +3462,31 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloquiáu"
 
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Saltando'l ficheru non esistente %s"
+
+#~ msgid "Failed to remove %s"
+#~ msgstr "Nun ye a desaniciar %s"
+
+#~ msgid "Unable to create %s"
+#~ msgstr "Nun ye a crear %s"
+
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Nun ye a lleer %s"
+
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr ""
 #~ "Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nun fui a camudar a %s"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Fallu al camudar al direutoriu d'alministración %sinfo"
 
 #~ msgid "Internal error getting a package name"
 #~ msgstr "Fallu internu al obtener un Nome de Paquete"
 
+#~ msgid "Reading file listing"
+#~ msgstr "Lleendo llistáu de ficheros"
+
 #~ 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 "
@@ -3371,43 +3496,6 @@ msgstr "Non bloquiáu"
 #~ "restablecer esti ficheru entós crea ún baleru y darréu reinstala la mesma "
 #~ "versión del paquete!"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Llinia inválida nel ficheru de desviación: %s"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Fallu internu al amestar una desviación"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "El ficheru de desviación ta tollíu"
-
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Nun fui a atopar un ficheru de control válidu"
-
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
-#~ "Limit. El valor actual ye : %lu. (man 5 apt.conf)"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Usa 'apt-get autoremove' pa desinstalalos."
-
-#~ msgid "Failed to remove %s"
-#~ msgstr "Nun ye a desaniciar %s"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Nun ye a crear %s"
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Nun ye a lleer %s"
-
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Fallu al camudar al direutoriu d'alministración %sinfo"
-
-#~ msgid "Reading file listing"
-#~ msgstr "Lleendo llistáu de ficheros"
-
 #~ msgid "Failed reading the list file %sinfo/%s"
 #~ msgstr "Fallu al lleer el ficheru de llista %sinfo/%s"
 
@@ -3417,6 +3505,15 @@ msgstr "Non bloquiáu"
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Fallu al abrir el ficheru de desviación %sdiversions"
 
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "El ficheru de desviación ta tollíu"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinia inválida nel ficheru de desviación: %s"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Fallu internu al amestar una desviación"
+
 #~ msgid "The pkg cache must be initialized first"
 #~ msgstr "El caché del paquete tien d'entamase primero"
 
@@ -3429,6 +3526,12 @@ msgstr "Non bloquiáu"
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "Fallu al lleer Md5. Desplazamientu %lu"
 
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Nun fui a camudar a %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Nun fui a atopar un ficheru de control válidu"
+
 #~ msgid "Couldn't open pipe for %s"
 #~ msgstr "Nun se pudo abrir una tubería pa %s"
 
@@ -3441,8 +3544,95 @@ msgstr "Non bloquiáu"
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "Nota: Esto faise automáticamente y baxo demanda por dpkg."
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Saltando'l ficheru non esistente %s"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Saltu mal formáu %s llinia %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Saltu mal formáu %s llinia %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Saltu mal formáu %s llinia %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "descompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lleíos, entá tenía de lleer %lu pero nun queda nada"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escritos, entá tenía d'escribir %lu pero nun pudo facerse"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Nun pudó facese la configuración inmediatamente nel desempaquetáu '%s'. "
+#~ "Por favor, mira man 5 apt.conf embaxo APT::Immediate-Configure for "
+#~ "details."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Hebo un error al procesar %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Hebo un error al procesar %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Hebo un error al procesar %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Hebo un error al procesar %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Hebo un error al procesar %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Hebo un error al procesar %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Hebo un error al procesar %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Hebo un error al procesar %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Hebo un error al procesar %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Hebo un error al procesar %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Fallu internu, nun fui a atopar el miembru"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Fallu internu, grupu '%s' nun tien paquete pseudo instalable"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "El ficheru release espiró, inorando %s (nun válidu dende %s)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Hebo un error al procesar %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Llinia %u mal formada na llista d'oríxenes %s (id del proveedor)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nun se pudo acceder al aniellu de claves '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nun fui quien a parchiar el ficheru"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' ehí\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "El paquete %s nun ta instaláu, nun va desaniciase\n"
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Procesando disparadores pa %s"
diff --git a/po/bg.po b/po/bg.po
index 111496314..1da29b6a3 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,16 +11,15 @@ msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:18+0000\n"
+"PO-Revision-Date: 2012-06-25 17:23+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -542,7 +541,7 @@ msgstr "Предупреждението за удостоверяването �
 
 #: cmdline/apt-get.cc:1079
 msgid "Install these packages without verification [y/N]? "
-msgstr "Инсталиране на тези пакети без проверка [y/N]? "
+msgstr "Инсталиране на тези пакети без проверка [y/N]?"
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
@@ -828,7 +827,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Изчисляване на актуализацията... "
+msgstr "Изчисляване на актуализацията..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -1952,7 +1951,7 @@ msgstr "Неуспех при отварянето на %s"
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
@@ -1972,7 +1971,7 @@ msgstr "*** Неуспех при създаването на връзка %s к
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " Превишен лимит на DeLink от %sB.\n"
+msgstr "Превишен лимит на DeLink от %sB.\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -2131,7 +2130,7 @@ msgstr "Неуспех при създаването на програмни к�
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Неуспех при изпълнението на gzip "
+msgstr "Неуспех при изпълнението на gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -3154,12 +3153,12 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Идентифициране... "
+msgstr "Идентифициране..."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Запазен етикет: %s\n"
+msgstr "Запазен етикет: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3517,56 +3516,36 @@ msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
-"изпълнение на „%s“. "
+"изпълнение на „%s“."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Без заключване"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Получен е един ред на заглавна част с над %u символа"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "Грешка при четене от процес %s"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Неуспех при отварянето на програмен канал за %s"
-
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Неуспех при намирането на валиден контролен файл"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Неуспех при преминаването в %s"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Грешка при анализирането на MD5. Изместване %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Пропускане на несъществуващ файл %s"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Първо трябва да се инициализира кеша с пакети"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Неуспех при премахването на %s"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Вътрешна грешка при добавянето на отклонение"
+#~ msgid "Unable to create %s"
+#~ msgstr "Неуспех при създаването на %s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Неправилен ред във файла с отклонения: %s"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Неуспех при получаването на атрибути %sinfo"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Файлът с отклонения е повреден"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Директориите info и temp трябва да бъдат на една и съща файлова система"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Неуспех при отварянето на файл с отклонения %sdiversions"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Неуспех при преминаването в администраторската директория %sinfo"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Вътрешна грешка при получаването на възел"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Вътрешна грешка при получаването на името на пакета"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s"
+#~ msgid "Reading file listing"
+#~ msgstr "Четене на списъка на файловете"
 
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -3577,43 +3556,148 @@ msgstr "Без заключване"
 #~ "възстановите този файл, запишете го като празен и веднага преинсталирайте "
 #~ "същата версия на пакета!"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Четене на списъка на файловете"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Вътрешна грешка при получаването на името на пакета"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Вътрешна грешка при получаването на възел"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Неуспех при преминаването в администраторската директория %sinfo"
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Неуспех при отварянето на файл с отклонения %sdiversions"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Директориите info и temp трябва да бъдат на една и съща файлова система"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Файлът с отклонения е повреден"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Неуспех при получаването на атрибути %sinfo"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Неправилен ред във файла с отклонения: %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Неуспех при създаването на %s"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Вътрешна грешка при добавянето на отклонение"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Неуспех при премахването на %s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Първо трябва да се инициализира кеша с пакети"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Грешка при анализирането на MD5. Изместване %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Неуспех при преминаването в %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Неуспех при намирането на валиден контролен файл"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Неуспех при отварянето на програмен канал за %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Грешка при четене от процес %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Получен е един ред на заглавна част с над %u символа"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "Това се прави автоматично от dpkg."
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Неправилно форматиран override %s, ред %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Неправилно форматиран override %s, ред %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Неправилно форматиран override %s, ред %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "декомпресираща програма"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr ""
+#~ "грешка при четене, все още има %lu за четене, но няма нито един останал"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "грешка при запис, все още име %lu за запис, но не успя"
+
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Недостатъчна памет за MMap. Увеличете стойността на променливата APT::"
-#~ "Cache-Limit. Текуща стойност: %lu (man 5 apt.conf)"
+#~ "Неуспех при незабавна настройка на разпакетиран „%s“. За повече "
+#~ "информация прочетете за APT::Immediate-Configure в „man 5 apt.conf“."
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Пропускане на несъществуващ файл %s"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Възникна грешка при обработката на %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Възникна грешка при обработката на %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Възникна грешка при обработката на %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Възникна грешка при обработката на %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Възникна грешка при обработката на %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Грешка при обработка на %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Възникна грешка при обработката на %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Възникна грешка при обработката на %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Възникна грешка при обработката на %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Възникна грешка при обработката на %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Вътрешна грешка, не може да се открие елемент"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr ""
+#~ "Вътрешна грешка, групата „%s“ няма псевдо-пакет, подходящ за инсталиране"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr ""
+#~ "Файлът %s вече не е валиден и ще бъде игнориран. (изтекъл е преди %s)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. "
+#~ "Завършване на работа."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Възникна грешка при обработката на %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr ""
+#~ "Лошо форматиран ред %u в списъка с източници %s (идентификатор на "
+#~ "производител)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Неуспех при достъпа до набор на ключове: „%s“"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Неуспех при закърпване на файла"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Обработка на тригерите на %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Недостатъчен ресурс при налагане на файл в паметта"
diff --git a/po/bs.po b/po/bs.po
index beeb0813f..ffb42dcaf 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,17 +7,13 @@ msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-10-05 08:55+0000\n"
-"Last-Translator: Samir Ribić <Unknown>\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"
 "Language: bs\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -26,51 +22,54 @@ msgstr "Paket %s verzije %s ima nezadovoljenu zavisnost:\n"
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "Ukupno naziva paketa: "
+msgstr "Ukupno naziva paketa:"
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr "Ukupno struktura paketa: "
+msgstr "Ukupno naziva paketa:"
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  Normalni paketi: "
+msgstr "  Normalni paketi:"
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Čisto virtuelni paketi: "
+msgstr "  Čisto virtuelni paketi:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  Pojedinačni virutuelni paketi: "
+msgstr "  Pojedinačni virutuelni paketi:"
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  Miješani virtuelni paketi: "
+msgstr "  Miješani virtuelni paketi:"
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  Nedostajući: "
+msgstr "  Nedostajući:"
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "Ukupno različitih verzija: "
+msgstr "Ukupno različitih verzija:"
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr "Ukupno različitih opisa: "
+msgstr "Ukupno različitih verzija:"
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "Ukupno zavisnosti: "
+msgstr "Ukupno zavisnosti:"
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "Ukupno Verzija/Datoteka odnosa: "
+msgstr "Ukupno Verzija/Datoteka odnosa:"
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr "Ukupno relacija opis/fajl: "
+msgstr "Ukupno Verzija/Datoteka odnosa:"
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
@@ -135,7 +134,7 @@ msgstr "(nije nađeno)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  Instalirano: "
+msgstr "  Instalirano:"
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
@@ -241,9 +240,9 @@ msgid "Please insert a Disc in the drive and press enter"
 msgstr "Molim, ubacite disk u uređaj i pritisnite „Enter“"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Neuspjelo montiranje '%s' na '%s'"
+msgstr "Ne mogu otvoriti %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -337,8 +336,9 @@ msgid "The following packages will be REMOVED:"
 msgstr "Slijedeći paketi će biti UKLONJENI:"
 
 #: cmdline/apt-get.cc:446
+#, fuzzy
 msgid "The following packages have been kept back:"
-msgstr "Sljedeći paketi su sačuvani neizmijenjeni:"
+msgstr "Slijedeći paketi su zadržani:"
 
 #: cmdline/apt-get.cc:467
 msgid "The following packages will be upgraded:"
@@ -407,11 +407,12 @@ msgstr "Paket %s je virtuelni paket kojeg obezbeđuju:\n"
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
-msgstr " [Instalirano]"
+msgstr "[Instalirano]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr " [Nije kandidat verzija]"
+msgstr "Verzije kandidata"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -480,9 +481,9 @@ msgid "%s is already the newest version.\n"
 msgstr "%s je već u najnovijoj verziji.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr "%s postavljen za ručnu instalaciju.\n"
+msgstr "ali se %s treba instalirati"
 
 #: cmdline/apt-get.cc:884
 #, c-format
@@ -523,8 +524,9 @@ msgid "Unmet dependencies. Try using -f."
 msgstr "Nezadovoljene zavisnosti. Pokušajte koristeći -f."
 
 #: cmdline/apt-get.cc:1068
+#, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "UPOZORENJE: sljedeći paketi ne mogu biti verifikovani!"
+msgstr "Slijedeći paketi će biti nadograđeni:"
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
@@ -622,8 +624,9 @@ msgid "Abort."
 msgstr "Odustani."
 
 #: cmdline/apt-get.cc:1282
+#, fuzzy
 msgid "Do you want to continue [Y/n]? "
-msgstr "Da li želite da nastavite [D/n]? "
+msgstr "Da li želite nastaviti? [Y/n]"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -666,14 +669,7 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"Sljedeći paket je nestao sa vašeg sistema jer\n"
-"su sve datoteke su prebrisane sa ostalim paketima:"
 msgstr[1] ""
-"Sljedeći paketi su nestali sa vašeg sistema jer\n"
-"su sve datoteke su prebrisane sa ostalim paketima:"
-msgstr[2] ""
-"Sljedeći paketi su nestali sa vašeg sistema jer\n"
-"su sve datoteke su prebrisane sa ostalim paketima:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -730,30 +726,28 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interna greška, AutoRemover je nešto zeznuo"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] "Instalirani paket je autoamtski instaliran i nije više potreban:"
-msgstr[1] "Instalirani paketi su automatski instalirani i nisu više potrebni:"
-msgstr[2] "Instalirani paketi su automatski instalirani i nisu više potrebni:"
+msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu paket je automatski instaliran i nije više potreban.\n"
-msgstr[1] "%lu paketa su automatski instalirani i nisu više potrebni.\n"
-msgstr[2] "%lu paketa je automatski instalirano i nije više potrebno.\n"
+msgstr[0] "Slijedeći NOVI paketi će biti instalirani:"
+msgstr[1] "Slijedeći NOVI paketi će biti instalirani:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Koristite 'apt-get autoremove' da ga uklonite."
-msgstr[1] "Koristite 'apt-get autoremove' da ih uklonite."
-msgstr[2] "Koristite 'apt-get autoremove' da ih uklonite."
+msgstr[0] ""
+msgstr[1] ""
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -805,9 +799,9 @@ msgid "Couldn't find package %s"
 msgstr "Ne mogu da pronađem paket %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s postavljeno da je automatski instalirano.\n"
+msgstr "ali se %s treba instalirati"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -819,7 +813,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Računam nadogradnju... "
+msgstr "Računam nadogradnju..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -1164,19 +1158,19 @@ msgstr ""
 "u uređaj „%s“ i pritisnite enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s se ne može markirati i nije instaliran.\n"
+msgstr "ali nije instaliran"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s je već postavljen za ručnu instalaciju.\n"
+msgstr "ali se %s treba instalirati"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s je već postavljen za automatsku instalaciju.\n"
+msgstr "ali se %s treba instalirati"
 
 #: cmdline/apt-mark.cc:228
 #, c-format
@@ -1195,14 +1189,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Čekao na %s ali nije bilu tu"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s postavljen na čekanje.\n"
+msgstr "ali se %s treba instalirati"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Prekinuto čekanje na %s.\n"
+msgstr "Ne mogu otvoriti %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1263,8 +1257,9 @@ msgstr ""
 "update se ne može koristiti za dodavanje novih CD-ROMova"
 
 #: methods/cdrom.cc:222
+#, fuzzy
 msgid "Wrong CD-ROM"
-msgstr "Pogrešan CD-ROM"
+msgstr "Pogrešan CD"
 
 #: methods/cdrom.cc:249
 #, c-format
@@ -1272,8 +1267,9 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Ne mogu demontirati CD-ROM na %s, moguće je da se još uvijek koristi."
 
 #: methods/cdrom.cc:254
+#, fuzzy
 msgid "Disk not found."
-msgstr "Disk nije pronađen."
+msgstr "Datoteka nije pronađena"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
@@ -1356,8 +1352,9 @@ msgid "A response overflowed the buffer."
 msgstr "Odgovor je prenapunio bafer."
 
 #: methods/ftp.cc:373 methods/ftp.cc:385
+#, fuzzy
 msgid "Protocol corruption"
-msgstr "Protokol oštećenje"
+msgstr "Oštećenje protokola"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
 #: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
@@ -1495,9 +1492,9 @@ msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Nešto se čudno desilo pri razrješavanju '%s:%s' (%i - %s)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Ne može se povezati na %s:%s:"
+msgstr "Ne mogu se povezati sa %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1518,8 +1515,9 @@ msgid "Unknown error executing gpgv"
 msgstr "Nepoznata greška izvršava gpgv"
 
 #: methods/gpgv.cc:228 methods/gpgv.cc:235
+#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr "Slijedeći potpisi su neispravni:\n"
+msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
 #: methods/gpgv.cc:242
 msgid ""
@@ -1629,9 +1627,9 @@ msgstr "Mirror datoteke '%s' nije nađena "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "Ne mogu učitati ogledanu datoteku '%s'"
+msgstr "Ne mogu otvoriti %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1882,9 +1880,9 @@ msgstr ""
 "vas obrišite i ponovo napravite bazu podataka."
 
 #: ftparchive/cachedb.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "Ne mogu da otvorim bazni fajl %s: %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 #: apt-inst/extract.cc:210
@@ -2118,7 +2116,7 @@ msgstr "Ne mogu stvoriti cijevi"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Ne mogu izvršiti gzip "
+msgstr "Ne mogu izvršiti gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2190,9 +2188,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Stvori duplikat konfiguracione datoteke %s/%s"
 
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write file %s"
-msgstr "Ne mogu zapisati datoteku %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
@@ -2286,12 +2284,14 @@ msgid "Couldn't make mmap of %llu bytes"
 msgstr "Ne mogu napraviti mmap od %llu bajtova"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr "Ne mogu zatvoriti mmap"
+msgstr "Ne mogu kreirati %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "Ne mogu sinhronizovati mmap"
+msgstr "Ne mogu kreirati %s"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2299,8 +2299,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Ne mogu napraviti mmap %lu bita"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr "Neuspjelo odsijecanje datoteke"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2551,9 +2552,9 @@ msgid "Could not open file %s"
 msgstr "Ne mogu otvoriti datoteku %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Ne mogu otvoriti datotečni deskriptor %d"
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2574,9 +2575,9 @@ msgid "write, still have %llu to write but couldn't"
 msgstr "pišem, još treba %llu pisati ali ne mobu"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr "Problem u zatvranju dattoteke %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/contrib/fileutl.cc:1748
 #, c-format
@@ -2634,8 +2635,9 @@ msgid "Recommends"
 msgstr "Preporučuje"
 
 #: apt-pkg/pkgcache.cc:306
+#, fuzzy
 msgid "Conflicts"
-msgstr "Sukobi"
+msgstr "Sukobljava se sa"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
@@ -2686,18 +2688,19 @@ msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr "Čitam informacije o stanju"
+msgstr "Sastavljam dostupne informacije"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr "Ne mogu otvoriti StateDatoteku %s"
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "Ne mogu napišem privremenu StateDatoteku %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2791,9 +2794,9 @@ msgstr ""
 "under APT::Immediate-Configure za detalje. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr "Ne mogu konfigurisati '%s'. "
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2849,9 +2852,9 @@ msgid "Archives directory %spartial is missing."
 msgstr "Arhivni direktorij %spartial nedostaje."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr "Ne može se zaključati direktorij %s"
+msgstr "Ne mogu kreirati %s"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2861,9 +2864,9 @@ msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Povlačenje datoteke %li od %li (%s ostaje)"
 
 #: apt-pkg/acquire.cc:895
-#, c-format
+#, fuzzy, c-format
 msgid "Retrieving file %li of %li"
-msgstr "Povlačenje datoteke %li od %li"
+msgstr "Čitam spisak datoteke"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -3015,9 +3018,9 @@ msgstr ""
 "list ili loše formirana datoteka)"
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ne mogu da nađem heš sumu za '%s' u Release datoteci"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3081,9 +3084,9 @@ msgid "Size mismatch"
 msgstr "Veličina se ne poklapa"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Ne mogu raščlaniti datoteku izdanja %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #: apt-pkg/indexrecords.cc:74
 #, c-format
@@ -3101,9 +3104,9 @@ msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Nevažeći 'Valid-Until'  u datoteci izdanja %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Nevažeći 'Date'  u datoteci izdanja %s"
+msgstr "Ne mogu otvoriti DB datoteku %s"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3129,8 +3132,9 @@ msgid "Stored label: %s\n"
 msgstr "Spremljena labela: %s\n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr "Demontiram  CD-ROM...\n"
+msgstr "Pogrešan CD"
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -3142,8 +3146,9 @@ msgid "Unmounting CD-ROM\n"
 msgstr "Demontiram CD-ROM\n"
 
 #: apt-pkg/cdrom.cc:665
+#, fuzzy
 msgid "Waiting for disc...\n"
-msgstr "Čekam na disk...\n"
+msgstr "Čekam na zaglavlja"
 
 #: apt-pkg/cdrom.cc:674
 msgid "Mounting CD-ROM...\n"
@@ -3189,8 +3194,9 @@ msgstr ""
 "'%s'\n"
 
 #: apt-pkg/cdrom.cc:830
+#, fuzzy
 msgid "Copying package lists..."
-msgstr "Kopiram spiskove paketa"
+msgstr "Čitam spiskove paketa"
 
 #: apt-pkg/cdrom.cc:857
 msgid "Writing new source list\n"
@@ -3239,9 +3245,9 @@ msgstr "Datoteka %s ne počinje ispravno potpisanom porukom"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr "Prsten ključeva nije instaliran u %s."
+msgstr "Odustajem od instalacije."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3254,9 +3260,9 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Nije pronađena verzija „%s“ za „%s“"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr "Ne mogu naći zadatak '%s'"
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-pkg/cacheset.cc:523
 #, c-format
@@ -3314,24 +3320,24 @@ msgid "Execute external solver"
 msgstr "Izvršenje spoljnjeg razrješivača"
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr "Instaliram %s"
+msgstr "  Instalirano:"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
-#, c-format
+#, fuzzy, c-format
 msgid "Configuring %s"
-msgstr "Konfigurišem %s"
+msgstr "Povezujem se sa %s"
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
-#, c-format
+#, fuzzy, c-format
 msgid "Removing %s"
-msgstr "Uklanjam %s"
+msgstr "Otvaram %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr "Potpuno uklanjam %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3350,19 +3356,19 @@ msgid "Directory '%s' missing"
 msgstr "Direktorij '%s' nedostaje"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr "Ne mogu otvoriti datoteku '%s'"
+msgstr "Ne mogu otvoriti %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing %s"
-msgstr "Pripremam %s"
+msgstr "Otvaram %s"
 
 #: apt-pkg/deb/dpkgpm.cc:945
-#, c-format
+#, fuzzy, c-format
 msgid "Unpacking %s"
-msgstr "Raspakujem %s"
+msgstr "Otvaram %s"
 
 #: apt-pkg/deb/dpkgpm.cc:950
 #, c-format
@@ -3370,9 +3376,9 @@ msgid "Preparing to configure %s"
 msgstr "Pripremam se za konfiguraciju %s"
 
 #: apt-pkg/deb/dpkgpm.cc:952
-#, c-format
+#, fuzzy, c-format
 msgid "Installed %s"
-msgstr "Instalirano %s"
+msgstr "  Instalirano:"
 
 #: apt-pkg/deb/dpkgpm.cc:957
 #, c-format
@@ -3380,9 +3386,9 @@ msgid "Preparing for removal of %s"
 msgstr "Pripremam za uklanjanje %s"
 
 #: apt-pkg/deb/dpkgpm.cc:959
-#, c-format
+#, fuzzy, c-format
 msgid "Removed %s"
-msgstr "Uklonjeno %s"
+msgstr "Preporučuje"
 
 #: apt-pkg/deb/dpkgpm.cc:964
 #, c-format
@@ -3390,9 +3396,9 @@ msgid "Preparing to completely remove %s"
 msgstr "Pripremam da u potpunosti uklonim %s"
 
 #: apt-pkg/deb/dpkgpm.cc:965
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removed %s"
-msgstr "Potpuno uklonjene %s"
+msgstr "Ne mogu ukloniti %s"
 
 #: apt-pkg/deb/dpkgpm.cc:1208
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
@@ -3482,166 +3488,22 @@ msgstr "dpkg je prekinut morate ručno pokrenuti '%s' da popravite problem. "
 msgid "Not locked"
 msgstr "Nije zaključano"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Čitam spisak datoteke"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Ne mogu kreirati %s"
-
 #~ msgid "Failed to remove %s"
 #~ msgstr "Ne mogu ukloniti %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Paket %s nije instaliran pa nije ni uklonjen\n"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Da biste ih uklonili izvršite „apt-get autoremove“."
-
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Primjedba: Ovo je urađeno automatski i namjerno od strane dpkg."
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Ne mogu da ustanovim status %sinfo"
-
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Ne mogu se prebaciti na direktorij administratora %sinfo"
-
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Unutrašnja pogreška kod pribavljanja naziva paketa"
-
-#~ 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 ""
-#~ "Ne mogu otvoriti datoteku spiskova '%sinfo%s'. Ako ne možete povratiti "
-#~ "ovu datoteku onda je načinite praznom i smjesta ponovo instalirajte istu "
-#~ "verziju paketa!"
-
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Informacije i privremeni direktoriji trebaju biti u istom datotečnom "
-#~ "sistemu"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Ne mogu pročitati datoteku spiskova %sinfo/%s"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Greška pri obradi MD5. Pomak %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr ""
-#~ "Neispravan \"ConfFile\" odjeljak  unutar statusne datoteke. Pomak %lu"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Ne mogu pronaći paket: zaglavlje, pomak %lu"
-
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Keš paketa mora biti najprije inicijaliziran"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Unutrašnja pogreška kod dodavanja preusmjeravanja"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Nevažeća linija u datoteci preusmjeravanja: %s"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Datoteka preusmjeravanja je oštećena"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Ne mogu otvoriti datoteku preusmjeravanja %sdiversions"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "Unutrašnja greška kod pribavljanja čvora"
+#~ msgid "Unable to create %s"
+#~ msgstr "Ne mogu kreirati %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Ne mogu pronaći važeću kontrolnu datoteku"
+#~ msgid "Reading file listing"
+#~ msgstr "Čitam spisak datoteke"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nisam mogao promijeniti u %s"
+#, fuzzy
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Ne mogu otvoriti %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Greška u čitanju %s  procesa"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Povezivanje neuspješno"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Ne mogu otvoriti cijev za %s"
-
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Primljeno je jedno zaglavlje preko %u karaktera"
-
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dynamic mmap ponestalo prostora. Molimo povećati veličinu APT:: Cache-"
-#~ "Limit. Trenutna vrijednost: %lu. (man 5 apt.conf)"
-
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Preskačem nepostojeću datoteku %s"
-
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Upotreba: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver je interfejs da koristi trenutni unutrašnju\n"
-#~ "kao spoljni razrješivač za APT porodice otklanjanje grešaka ili srodno\n"
-#~ "\n"
-#~ "Opcije:\n"
-#~ "  -h  Ova pomoć.\n"
-#~ "  -q  Upisiv izlaz - bez indikatora napretka\n"
-#~ "  -c=? Čitaj ovu konfiguracionu datoteku\n"
-#~ "  -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
-#~ "apt.conf(5) stranice uputstva za više informacija i opcija\n"
-#~ "                       Ovaj APT je moćan kao superkrava.\n"
-
-#~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
-#~ msgstr ""
-#~ "Upotreba: apt-mark [oppcije] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark je jednostavno komandno sučelje za označavanje paketa kao ručno "
-#~ "ili\n"
-#~ "automattski instaliranih. Ono takoćer lista markere.\n"
-#~ "\n"
-#~ "Komande:\n"
-#~ "   auto - Označava date pakete kao automatski instalirane\n"
-#~ "   manual - Označava date pakete kao ručno instalirane\n"
-#~ "\n"
-#~ "Opcije:\n"
-#~ "  -h Ova pomoć.\n"
-#~ "  -q Evidentiran izlaz - bez indikatora napretka\n"
-#~ "  -qq Bez izlaza osim grešaka\n"
-#~ "  -s Bez djelovanja, samo simulacija\n"
-#~ "  -f  čita/piše auto/ručno markiranje u datoj datoteci\n"
-#~ "  -c=? Pročitaj konfiguracionu datoteku\n"
-#~ "  -o=? Postavi proizvoljnu konfiguracionu opciju, npr -o dir::cache=/tmp\n"
-#~ "Vidi stranice apt-mark(8) i apt.conf(5) za više informacija"
+#~ msgid "File date has changed %s"
+#~ msgstr "Datum datoteke je promijenjen %s"
diff --git a/po/ca.po b/po/ca.po
index 54a1ef1ea..15e3bdee2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,24 +1,22 @@
 # Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011, 2012 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, 2006, 2008, 2009, 2011.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009, 2011, 2012.
 # Agustí Grau <fletxa@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.8.15\n"
+"Project-Id-Version: apt 0.9.7.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Jordi Mallach <jordi@canonical.com>\n"
+"PO-Revision-Date: 2012-10-19 13:30+0200\n"
+"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -87,7 +85,7 @@ msgstr "Nombre total de l'espai per a dependències de versió: "
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Nombre total de l'espai desperdiciat: "
+msgstr "Nombre total de l'espai desaprofitat: "
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -110,7 +108,8 @@ msgstr "Heu de donar com a mínim un patró de cerca"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Aquesta ordre és desfasada. Empreu «apt-mark showauto» en el seu lloc."
+msgstr ""
+"Aquesta ordre és desaconsellada. Empreu «apt-mark showauto» en el seu lloc."
 
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
@@ -165,6 +164,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,10 +200,46 @@ 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 ""
+"Forma d'ús: apt-cache [opcions] ordre\n"
+"    apt-cache [opcions] add fitxer1 [fitxer2 …]\n"
+"    apt-cache [opcions] showpkg paquet1 [paquet2 …]\n"
+"    apt-cache [opcions] showsrc paquet1 [paquet2 …]\n"
+"\n"
+"apt-cache és una eina de baix nivell emprada per a consultar\n"
+"la informació dels fitxers binaris de memòria cau de l'APT.\n"
+"\n"
+"Ordres:\n"
+"   gencaches - Crea la memòria cau de paquets i fonts\n"
+"   showpkg - Mostra informació general d'un sol paquet\n"
+"   showsrc - Mostra un registre d'un paquet font\n"
+"   stats - Mostra algunes estadístiques bàsiques\n"
+"   dump - Mostra el fitxer sencer en un format concís\n"
+"   dumpavail - Genera un registre llegible a stdout\n"
+"   unmet - Mostra dependències sense satisfer\n"
+"   search - Cerca en la llista de paquets per un patró d'expressió regular\n"
+"   show - Mostra un registre llegible pel paquet\n"
+"   showauto - Mostra una llista de paquets instaŀlats automàticanent\n"
+"   depends - Mostra informació de dependències (en cru) d'un paquet\n"
+"   rdepends - Mostra informació de dependències inverses d'un paquet\n"
+"   pkgnames - Llista els noms de tots els paquets del sistema\n"
+"   dotty - Genera gràfiques de paquets per a GraphViz\n"
+"   xvcg - Genera gràfiques de paquets per a xvcg\n"
+"   policy - Mostra la configuració de política\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -p=? La memòria cau de paquets.\n"
+"  -s=? La memòria cau de la font.\n"
+"  -q   Inhabilita l'indicador de progrés.\n"
+"  -i   Només mostra dependències importants amb l'opció «unmet».\n"
+"  -c=? Llegeix aquest fitxer de configuració.\n"
+"  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
+"Vegeu les pàgines de manual apt-cache(8) i apt.conf(5) per a més "
+"informació.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disk 1»"
+msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disc 1»"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
@@ -212,7 +248,7 @@ msgstr "Inseriu un disc en la unitat i premeu Intro"
 #: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "No s'ha pogut muntar '%s' a '%s'"
+msgstr "No s'ha pogut muntar «%s» a «%s»"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -256,7 +292,7 @@ msgstr "S"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -362,12 +398,12 @@ msgstr "%lu no instaŀlats o suprimits completament.\n"
 #: cmdline/apt-get.cc:635
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Nota: s'està seleccionant '%s' per a la tasca '%s'\n"
+msgstr "Nota: s'està seleccionant «%s» per a la tasca «%s»\n"
 
 #: cmdline/apt-get.cc:640
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Nota: s'està seleccionant '%s' per a l'expressió regular '%s'\n"
+msgstr "Nota: s'està seleccionant «%s» per a l'expressió regular «%s»\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -380,7 +416,7 @@ msgstr " [Instaŀlat]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [Versió no candidata]"
+msgstr "[Versió no candidata]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -409,18 +445,20 @@ msgstr "El paquet «%s» no té candidat d'instaŀlació"
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Els paquets virtuals com «%s» no poden ser esborrats\n"
+msgstr "Els paquets virtuals com «%s» no es poden suprimir\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
+"El paquet «%s» no està instaŀlat, així doncs no es suprimirà. Volíeu dir "
+"«%s»?\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "El paquet «%s» no està instaŀlat, així doncs no es suprimirà\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -457,7 +495,7 @@ msgstr "S'ha marcat %s com instaŀlat manualment.\n"
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versió seleccionada '%s' (%s) per a '%s'\n"
+msgstr "Versió seleccionada «%s» (%s) per a «%s»\n"
 
 #: cmdline/apt-get.cc:889
 #, c-format
@@ -726,8 +764,8 @@ msgstr[1] ""
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Empreu «apt-get autoremove» per a suprimir-lo."
+msgstr[1] "Empreu «apt-get autoremove» per a suprimir-los."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -788,8 +826,8 @@ msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Aquesta ordre és desfasada. Empreu «apt-mark auto» i «apt-mark manual» en el "
-"seu lloc."
+"Aquesta ordre és desaconsellada. Empreu «apt-mark auto» i «apt-mark manual» "
+"en el seu lloc."
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
@@ -815,7 +853,7 @@ msgstr "No és possible blocar el directori de descàrrega"
 #: cmdline/apt-get.cc:2386
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "No es troba una font per baixar la versió «%s» de «%s»"
 
 #: cmdline/apt-get.cc:2391
 #, c-format
@@ -848,6 +886,10 @@ msgid ""
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Empreu:\n"
+"bzr branch %s\n"
+"per obtenir les últimes actualitzacions (possiblement no publicades) del "
+"paquet.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -919,6 +961,8 @@ msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
+"No hi ha informació d'arquitectura disponible per a %s. Vegeu apt.conf(5) "
+"APT::Architectures per a configurar-ho"
 
 #: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
 #, c-format
@@ -937,6 +981,8 @@ msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"La dependència %s en %s no es pot satisfer perquè %s no és permès als "
+"paquets «%s»"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -944,8 +990,8 @@ msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
-"La dependència %s en %s no es pot satisfer per que no es pot trobar el "
-"paquet %s"
+"La dependència %s en %s no es pot satisfer perquè no es pot trobar el paquet "
+"%s"
 
 #: cmdline/apt-get.cc:3049
 #, c-format
@@ -960,6 +1006,8 @@ msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"La dependència %s per a %s no es pot satisfer perquè la versió candidata del "
+"paquet %s no pot satisfer els requeriments de versions"
 
 #: cmdline/apt-get.cc:3094
 #, c-format
@@ -967,6 +1015,8 @@ msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"La dependència %s en %s no es pot satisfer perquè el paquet %s no té versió "
+"candidata"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -992,6 +1042,7 @@ msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1036,6 +1087,51 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Forma d'ús:  apt-get [opcions] ordre\n"
+"             apt-get [opcions] install|remove paq1 [paq2 …]\n"
+"             apt-get [opcions] source paq1 [paq2 …]\n"
+"\n"
+"apt-get és una interfície de línia d'ordres simple per\n"
+"baixar i instaŀlar paquets. Les ordres més freqüents són\n"
+"update i install.\n"
+"\n"
+"Ordres:\n"
+"   update - Obtén llistes noves dels paquets\n"
+"   upgrade - Realitza una actualització\n"
+"   install - Instaŀla nous paquets (el paquet és libc6, no libc6.deb)\n"
+"   remove - Suprimeix paquets\n"
+"   autoremove - Suprimeix automàticament tots els paquets en desús\n"
+"   purge - Suprimeix i purga paquets\n"
+"   source - Baixa arxius font\n"
+"   build-dep - Configura dependències de construcció pels paquets font\n"
+"   dist-upgrade - Actualitza la distribució, vegeu apt-get(8)\n"
+"   dselect-upgrade - Segueix les seleccions del dselect\n"
+"   clean - Suprimeix els fitxers d'arxiu baixats\n"
+"   autoclean - Suprimeix els fitxers d'arxiu antics baixats\n"
+"   check - Verifica que no hi hagi dependències trencades\n"
+"   markauto - Marca els paquets donats com a instaŀlats automàticament\n"
+"   unmarkauto - Marca els paquets donats com a instaŀlats manualment\n"
+"   changelog - Baixa i mostra el registre de canvis del paquet\n"
+"   download - Baixa el paquet binari al directori actual\n"
+"\n"
+"Opcions:\n"
+"  -h  Aquest text d'ajuda\n"
+"  -q  Sortida enregistrable - sense indicador de progrés\n"
+"  -qq Sense sortida, llevat dels errors\n"
+"  -d  Només baixa - NO instaŀles o desempaquetes arxius\n"
+"  -s  No actues. Realitza les ordres en mode de simulació\n"
+"  -y  Assumeix «Sí» per a totes les preguntes i no preguntes\n"
+"  -f  Intenta corregir un sistema amb dependències trencades\n"
+"  -m  Intenta continuar si no es troben els arxius\n"
+"  -u  Mostra també una llista dels paquets actualitzats\n"
+"  -b  Construeix el paquet font després de baixar-lo\n"
+"  -V  Mostra els números de versió detallats\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de configuració arbitrària, p. ex.\n"
+"       -o dir::cache=/tmp\n"
+"Vegeu les pàgines de manual apt-get(8), sources.list(5) i apt.conf(5)\n"
+"per a obtenir més informació i opcions.\n"
+"                       Aquest APT té superpoders bovins.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1045,7 +1141,7 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 "Nota: Això només és una simulació!\n"
-"      l'apt-get necessita privilegis de root per a l'execució real.\n"
+"      L'apt-get necessita privilegis de root per a l'execució real.\n"
 "      Tingueu en ment que el bloqueig està desactivat,\n"
 "      per tant, no es depèn de la situació actual real."
 
@@ -1104,12 +1200,12 @@ msgstr "%s ja estava marcat com instaŀlat automàticament.\n"
 #: cmdline/apt-mark.cc:228
 #, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s ja estava mantingut.\n"
+msgstr "%s ja estava retingut.\n"
 
 #: cmdline/apt-mark.cc:230
 #, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s ja estava sense marcar com a mantingut.\n"
+msgstr "%s ja estava no retingut.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1120,16 +1216,16 @@ msgstr "Esperava %s però no hi era"
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
 #, c-format
 msgid "%s set on hold.\n"
-msgstr "S'ha establert %s com a mantingut.\n"
+msgstr "S'ha marcat %s com retingut.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
 #, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "S'ha canceŀlat la marca com a mantingut de %s.\n"
+msgstr "S'ha cancel·lat la marca de retenció en %s.\n"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Ha fallat l'execució del dpkg. Sou el superusuari?"
+msgstr "L'execució del dpkg ha fallat. Sou root?"
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1365,7 +1461,7 @@ msgstr "Consulta"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "No es pot invocar "
+msgstr "No es pot invocar"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1407,17 +1503,17 @@ msgstr "S'està connectant amb %s"
 #: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "No s'ha pogut resoldre '%s'"
+msgstr "No s'ha pogut resoldre «%s»"
 
 #: methods/connect.cc:197
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "S'ha produït un error temporal en resoldre '%s'"
+msgstr "S'ha produït un error temporal en resoldre «%s»"
 
 #: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i - %s)"
+msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
 
 #: methods/connect.cc:247
 #, c-format
@@ -1438,8 +1534,8 @@ msgstr "S'ha trobat almenys una signatura invàlida."
 #: methods/gpgv.cc:189
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"No s'ha pogut executar «gpgv» per a verificar la signatura (està instaŀlat "
-"el gpgv?)"
+"No s'ha pogut executar el «gpgv» per a verificar la signatura (està "
+"instaŀlat el gpgv?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1554,14 +1650,14 @@ msgstr "No es pot canviar a %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "No s'ha trobat el fitxer rèplica «%s» "
+msgstr "No s'ha trobat el fitxer rèplica «%s»"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
 #, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "No s'ha pogut llegir el fitxer rèplica «%s»"
+msgstr "No es pot llegir el fitxer rèplica «%s»"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1919,17 +2015,17 @@ msgstr "No es pot obrir %s"
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
 #, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Línia predominant %s malformada %llu núm 1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
 #, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Línia predominant %s malformada %llu núm 2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
 #, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Línia predominant %s malformada %llu núm 3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1982,6 +2078,7 @@ msgid "Failed to rename %s to %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1994,6 +2091,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Forma d'ús: apt-extracttemplates fitxer1 [fitxer2 …]\n"
+"\n"
+"apt-extracttemplates és una eina per a extreure informació de\n"
+"configuració i plantilles dels paquets debian\n"
+"\n"
+"Opcions:\n"
+"  -h   Aquest text d'ajuda.\n"
+"  -t   Estableix el directori temporal\n"
+"  -c=? Llegeix aquest fitxer de configuració\n"
+"  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2194,7 +2301,7 @@ msgstr "No s'ha pogut duplicar el descriptor del fitxer %i"
 #: apt-pkg/contrib/mmap.cc:119
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "No s'ha pogut crear un mapa de memòria de %llu octets"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2481,12 +2588,12 @@ msgstr "No s'ha pogut executar el compressor "
 #: apt-pkg/contrib/fileutl.cc:1309
 #, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "llegits, falten %llu per llegir, però no queda res"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
 #, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "escrits, falten %llu per escriure però no s'ha pogut"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2521,7 +2628,7 @@ msgstr "El fitxer de memòria cau de paquets és una versió incompatible"
 
 #: apt-pkg/pkgcache.cc:162
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "El fitxer de memòria cau de paquets està corromput, és massa petit"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2566,7 +2673,7 @@ msgstr "Trenca"
 
 #: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
-msgstr "Millores"
+msgstr "Millora"
 
 #: apt-pkg/pkgcache.cc:318
 msgid "important"
@@ -2703,13 +2810,13 @@ msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"No s'ha pogut realitzar la configuració immediata de '%s'. Consulteu man 5 "
-"apt.conf, secció APT::Immediate-Configure per a més detalls. (%d)"
+"No s'ha pogut realitzar la configuració immediata de «%s». Vegeu man 5 apt."
+"conf, sota APT::Immediate-Configure per a més detalls. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "No s'ha pogut configurar «%s»."
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2754,6 +2861,8 @@ msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
+"emprat els antics."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2835,6 +2944,8 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
+"El valor «%s» és invàlid per a APT:Default-Release donat que aquest "
+"llançament no és disponible a les fonts"
 
 #: apt-pkg/policy.cc:396
 #, c-format
@@ -2866,7 +2977,7 @@ msgstr "La memòria cau té un sistema de versions incompatible"
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "S'ha produït un error en processar %s (%s%d)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2882,7 +2993,7 @@ msgstr ""
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, heu excedit el nombre de descripcions que aquest APT és capaç de "
-"gestionar."
+"gestionar. "
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2952,6 +3063,8 @@ msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
+"El fitxer Release per a %s ha caducat (invàlid des de %s). Les "
+"actualitzacions per a aquest dipòsit no s'aplicaran."
 
 #: apt-pkg/acquire-item.cc:1499
 #, c-format
@@ -3023,12 +3136,12 @@ msgstr "No hi ha una entrada Hash al fitxer Release %s"
 #: apt-pkg/indexrecords.cc:121
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "No hi ha una entrada 'Valid-Until' vàlida al fitxer Release %s"
+msgstr "El camp «Valid-Until» al fitxer Release %s és invàlid"
 
 #: apt-pkg/indexrecords.cc:140
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "No hi ha una entrada 'date' al fitxer Release %s"
+msgstr "El camp «Date» al fitxer Release %s és invàlid"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3046,7 +3159,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "S'està identificant… "
+msgstr "S'està identificant…"
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
@@ -3092,8 +3205,8 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
-"No s'ha pogut localitzar cap fitxer del paquet, potser no és un disc de "
-"Debian o la arquitectura és incorrecta?"
+"No s'ha trobat cap fitxer de paquets, potser no és un disc de Debian o la "
+"arquitectura és incorrecta?"
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
@@ -3160,7 +3273,7 @@ msgstr "El resum no coincideix per a: %s"
 #: apt-pkg/indexcopy.cc:662
 #, c-format
 msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
+msgstr "El fitxer %s no comença amb un missatge signat en clar"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
@@ -3227,23 +3340,23 @@ msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr ""
+msgstr "Envia l'escenari al resoledor"
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr ""
+msgstr "Envia la petició al resoledor"
 
 #: apt-pkg/edsp.cc:277
 msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Prepara per a rebre una solució"
 
 #: apt-pkg/edsp.cc:284
 msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "El resoledor extern ha fallat sense un missatge d'error adient"
 
 #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
 msgid "Execute external solver"
-msgstr ""
+msgstr "Executa un resoledor extern"
 
 #: apt-pkg/deb/dpkgpm.cc:72
 #, c-format
@@ -3268,7 +3381,7 @@ msgstr "S'ha suprimit completament %s"
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr "Anotant la desaparició de %s"
+msgstr "S'està anotant la desaparició de %s"
 
 #: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
@@ -3338,7 +3451,7 @@ msgstr "S'està executant dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1410
 msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "S'ha interromput l'operació abans que pogués finalitzar"
 
 #: apt-pkg/deb/dpkgpm.cc:1472
 msgid "No apport report written because MaxReports is reached already"
@@ -3384,7 +3497,7 @@ msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
-"d'I/O del dpkg"
+"d'E/S del dpkg"
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
@@ -3407,74 +3520,89 @@ msgstr "No es pot blocar el directori d'administració (%s), sou root?"
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"S'ha interromput el dpkg, harieu d'executar manualment «%s» per a corregir "
-"el problema. "
+"S'ha interromput el dpkg, hauríeu d'executar manualment «%s» per a corregir "
+"el problema."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "No blocat"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "No s'ha pogut obrir un conducte per a %s"
+#~ msgid "decompressor"
+#~ msgstr "decompressor"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "No s'ha trobat un fitxer de control vàlid"
+#~ msgid "Failed to remove %s"
+#~ msgstr "No es pot suprimir %s"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "No s'ha pogut canviar a %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "No es pot crear %s"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "No s'ha pogut fer «stat» de %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Secció ConfFile dolenta al fitxer d'estat. Desplaçament %lu"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "La info i els directoris temp necessiten estar en el mateix sistema de "
+#~ "fitxers"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "No s'ha pogut canviar al directori d'administració %sinfo"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "S'ha produït un error intern en obtenir un nom de paquet"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "S'ha produït un error intern en afegir una desviació"
+#~ msgid "Reading file listing"
+#~ msgstr "S'està llegint el llistat de fitxers"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Línia no vàlida al fitxer de desviació: %s"
+#~ 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 ""
+#~ "No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu "
+#~ "restaurar aquest fitxer, creeu-lo buit i torneu a instaŀlar immediatament "
+#~ "la mateixa versió del paquet!"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "El fitxer de desviació està corrupte"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "S'ha produït un error en obtenir un node"
 
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "S'ha produït un error en obrir el fitxer de desviació %sdiversions"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "S'ha produït un error en obtenir un node"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "El fitxer de desviació està corrupte"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "No s'ha pogut llegir la llista del fitxer %sinfo/%s"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Línia no vàlida al fitxer de desviació: %s"
 
-#~ msgid "Reading file listing"
-#~ msgstr "S'està llegint el llistat de fitxers"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "S'ha produït un error intern en afegir una desviació"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "S'ha produït un error intern en obtenir un nom de paquet"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Primer s'ha d'inicialitzar la memòria cau d'aquest paquet"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "La info i els directoris temp necessiten estar en el mateix sistema de "
-#~ "fitxers"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "No s'ha trobat una capçalera Package:, desplaçament %lu"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "No s'ha pogut fer «stat» de %sinfo"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Secció ConfFile dolenta al fitxer d'estat. Desplaçament %lu"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "No es pot crear %s"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "S'ha produït un error en analitzar la suma MD5. Desplaçament %lu"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Empreu «apt-get autoremove» per a suprimir-los."
+#~ msgid "Couldn't change to %s"
+#~ msgstr "No s'ha pogut canviar a %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "No es pot suprimir %s"
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "S'ha produït un error intern, no s'ha trobat el membre"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "No s'ha trobat un fitxer de control vàlid"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "No s'ha pogut obrir un conducte per a %s"
 
 #~ msgid "Read error from %s process"
 #~ msgstr "S'ha produït un error en llegir des del procés %s"
@@ -3482,72 +3610,120 @@ msgstr "No blocat"
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "S'ha obtingut una capçalera d'una sola línea de més de %u caràcters"
 
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr ""
+#~ "S'ha produït un error intern, el grup «%s» no disposa d'un pseudopaquet "
+#~ "instaŀlable"
+
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
-#~ "Limit. Valor actual: %lu. (man 5 apt.conf)"
+#~ "No s'ha pogut realitzar la configuració immediata de «%s» ja "
+#~ "desempaquetat. Vegeu man 5 apt.conf, sota APT::Immediate-Configure per a "
+#~ "més detalls."
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "No s'ha pogut canviar al directori d'administració %sinfo"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "S'ha produït un error durant el processament de %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "S'ha produït un error durant el processament de %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "S'ha produït un error durant el processament de %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr ""
+#~ "S'ha produït un error durant el processament de %s (CollectFileProvides)"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr ""
+#~ "El fitxer Release ha caducat, s'està ignorant %s (invàlid des de %s)"
 
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "S'està ometent el fitxer %s que no existeix"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "El paquet %s no està instaŀlat, així doncs no es suprimirà\n"
+#~ 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."
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "S'ha produït un error durant el processament de %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr ""
+#~ "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "No s'ha pogut accedir a l'anell de claus: «%s»"
+
+#~ msgid "Could not patch file"
+#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "S'estan processant els activadors per al paquet %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "L'MMap dinàmic s'ha quedat sense espai"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "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 ""
-#~ "Forma d'ús: apt-mark [opcions] {auto|manual} paq1 [paq2 …]\n"
-#~ "\n"
-#~ "apt-mark és una interfície simple de la línia d'ordres per a marcar\n"
-#~ "paquets com a instaŀlats automàticament o manual. També pot llistar\n"
-#~ "les marques.\n"
-#~ "\n"
-#~ "Ordres:\n"
-#~ "\n"
-#~ "    auto - Marca els paquets donats com a instaŀlats automàticament\n"
-#~ "    manual - Marca els paquets donats com a instaŀlats manualment\n"
-#~ "\n"
-#~ "Opcions:\n"
-#~ "  -h   Aquest text d'ajuda.\n"
-#~ "  -q   Sortida enregistrable - sense indicador de progrés\n"
-#~ "  -qq  Sense sortida, llevat dels errors\n"
-#~ "  -s   No actues. Mostra només què es faria.\n"
-#~ "  -f   Llegeix/escriu les marques auto/manual emprant el fitxer donat\n"
-#~ "  -c=? Llegeix aquest fitxer de configuració\n"
-#~ "  -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
-#~ "Vegeu les pàgines de manual apt-mark(8) i apt.conf(5) per a més "
-#~ "informació."
+#~ "Degut a que només heu requerit una única operació, serà molt\n"
+#~ "probable que el paquet no sigui instaŀlable i que s'hagi d'emetre\n"
+#~ "un informe d'error en contra d'aquest per a arxivar-lo."
+
+#~ msgid "File date has changed %s"
+#~ msgstr "La data del fitxer ha canviat %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "S'està llegint la llista de fitxers"
+
+#~ msgid "Could not execute "
+#~ msgstr "No s'ha pogut executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "S'està preparant per a suprimir amb la configuració %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "S'ha suprimit 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"
 
 #~ 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!"
+#~ "Some broken packages were found while trying to process build-"
+#~ "dependencies for %s.\n"
+#~ "You might want to run 'apt-get -f install' to correct these."
 #~ msgstr ""
-#~ "No s'ha pogut obrir la llista del fitxer «%sinfo/%s». Si no podeu "
-#~ "restaurar aquest fitxer, creeu-lo buit i torneu a instaŀlar immediatament "
-#~ "la mateixa versió del paquet!"
+#~ "S'han trobat alguns paquets trencats mentre es processaven les\n"
+#~ "dependències de construcció per a %s.\n"
+#~ "Potser voldreu executar 'apt-get -f install' per a corregir-ho."
diff --git a/po/cs.po b/po/cs.po
index aee205fd0..3ac5037fc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,16 +8,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
+"PO-Revision-Date: 2012-07-08 13:46+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>=2 && n<=4 ? 1 : 2;\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -406,7 +404,7 @@ msgstr "Balík %s je virtuální balík poskytovaný:\n"
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
-msgstr " [Instalovaný]"
+msgstr "[Instalovaný]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
@@ -905,7 +903,7 @@ msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
 #: cmdline/apt-get.cc:2623
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Stáhnout zdroj %s\n"
+msgstr "Stažení zdroje %s\n"
 
 #: cmdline/apt-get.cc:2661
 msgid "Failed to fetch some archives."
@@ -974,13 +972,13 @@ msgstr ""
 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"
+msgstr "závislost %s pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
 #: cmdline/apt-get.cc:3049
 #, 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ý"
+"Selhalo splnění závislosti %s pro %s: Instalovaný balík %s je příliš nový"
 
 #: cmdline/apt-get.cc:3088
 #, c-format
@@ -1003,7 +1001,7 @@ msgstr ""
 #: cmdline/apt-get.cc:3117
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Selhalo splnění %s závislosti pro %s: %s"
+msgstr "Selhalo splnění závislosti %s pro %s: %s"
 
 #: cmdline/apt-get.cc:3133
 #, c-format
@@ -1412,7 +1410,7 @@ msgstr "Nelze přijmout spojení"
 
 #: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
 msgid "Problem hashing file"
-msgstr "Problém s hashováním souboru"
+msgstr "Problém s kontrolním součtem souboru"
 
 #: methods/ftp.cc:885
 #, c-format
@@ -1501,7 +1499,7 @@ msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!"
 
 #: methods/gpgv.cc:185
 msgid "At least one invalid signature was encountered."
-msgstr "Byl zaznamenán nejméně jeden neplatný podpis."
+msgstr "Byl zaznamenán nejméně jeden neplatný podpis. "
 
 #: methods/gpgv.cc:189
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
@@ -1619,7 +1617,7 @@ msgstr "Nelze přejít do %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Soubor se zrcadly %s nebyl nalezen "
+msgstr "Soubor se zrcadly „%s“ nebyl nalezen "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1919,7 +1917,7 @@ msgstr "Nelze otevřít %s"
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " Odlinkování %s [%s]\n"
+msgstr "Odlinkování %s [%s]\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
@@ -1948,7 +1946,7 @@ msgstr "Archiv nemá pole Package"
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s nemá žádnou položku pro override\n"
+msgstr " %s nemá žádnou položku pro override\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
@@ -1958,12 +1956,12 @@ msgstr "  správce %s je %s, ne %s\n"
 #: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s nemá žádnou zdrojovou položku pro override\n"
+msgstr " %s nemá žádnou zdrojovou položku pro override\n"
 
 #: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s nemá ani žádnou binární položku pro override\n"
+msgstr " %s nemá ani žádnou binární položku pro override\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -2579,7 +2577,7 @@ msgstr "Cache soubor balíků je poškozen"
 
 #: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
-msgstr "Cache soubor balíků je v nekompatibilní verzi"
+msgstr "Cache soubor balíků má nekompatibilní verzi"
 
 #: apt-pkg/pkgcache.cc:162
 msgid "The package cache file is corrupted, it is too small"
@@ -2652,7 +2650,7 @@ msgstr "extra"
 
 #: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
-msgstr "Vytvářím strom závislostí"
+msgstr "Vytváří se strom závislostí"
 
 #: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
@@ -2768,7 +2766,7 @@ msgstr ""
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr "Nelze nastavit „%s“. "
+msgstr "Nelze nastavit „%s“."
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -3032,8 +3030,8 @@ 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 ""
-"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)"
+"Nebylo možné 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:1705
 #, c-format
@@ -3041,7 +3039,7 @@ msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
-"Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
+"Nebylo možné nalézt soubor s balíkem %s. Asi budete muset tento balík "
 "opravit ručně."
 
 #: apt-pkg/acquire-item.cc:1764
@@ -3101,7 +3099,7 @@ msgstr "Rozpoznávám… "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Uložený název: %s\n"
+msgstr "Uložený název: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3443,102 +3441,227 @@ msgstr "Nelze uzamknout administrační adresář (%s). Jste root?"
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“. "
+msgstr "dpkg byl přerušen, pro nápravu problému musíte ručně spustit „%s“."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Není uzamčen"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Přeskakuji neexistující soubor %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Chyba čtení z procesu %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Selhalo odstranění %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Nelze najít platný kontrolní soubor"
+#~ msgid "Unable to create %s"
+#~ msgstr "Nelze vytvořit %s"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Chyba při zpracování MD5. Offset %lu"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Selhalo vyhodnocení %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Špatná sekce ConfFile ve stavovém souboru na pozici %lu"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Adresáře info a temp musí být na stejném souborovém systému"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Chyba při hledání Balíku: Hlavička, offset %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Nepodařilo se změnit na admin adresář %sinfo"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Cache balíků se musí nejprve inicializovat"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Vnitřní chyba při získávání jména balíku"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Vnitřní chyba při přidávání diverze"
+#~ msgid "Reading file listing"
+#~ msgstr "Čtu výpis souborů"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Neplatná řádka v diverzním souboru: %s"
+#~ 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 ""
+#~ "Selhalo otevření souboru seznamů „%sinfo/%s“. Pokud nemůžete tento soubor "
+#~ "obnovit, vytvořte jej nový prázdný a ihned znovu nainstalujte tu samou "
+#~ "verzi balíku!"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Diverzní soubor je porušen"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Chyba při čtení souboru se seznamy %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "Vnitřní chyba při získávání uzlu"
 
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Selhalo otevření souboru s diverzemi %sdiversions"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Vnitřní chyba při získávání uzlu"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Diverzní soubor je porušen"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Chyba při čtení souboru se seznamy %sinfo/%s"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Neplatná řádka v diverzním souboru: %s"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Čtu výpis souborů"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Vnitřní chyba při přidávání diverze"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Vnitřní chyba při získávání jména balíku"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Cache balíků se musí nejprve inicializovat"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Nepodařilo se změnit na admin adresář %sinfo"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Chyba při hledání Balíku: Hlavička, offset %lu"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Adresáře info a temp musí být na stejném souborovém systému"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Špatná sekce ConfFile ve stavovém souboru na pozici %lu"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Selhalo vyhodnocení %sinfo"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Chyba při zpracování MD5. Offset %lu"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Selhalo odstranění %s"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Nelze přejít do %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Nelze najít platný kontrolní soubor"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nelze otevřít rouru pro %s"
 
-#~ 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 ""
-#~ "Selhalo otevření souboru seznamů „%sinfo/%s“. Pokud nemůžete tento soubor "
-#~ "obnovit, vytvořte jej nový prázdný a ihned znovu nainstalujte tu samou "
-#~ "verzi balíku!"
+#~ msgid "Read error from %s process"
+#~ msgstr "Chyba čtení z procesu %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Získal jsem jednu řádku hlavičky přes %u znaků"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "Poznámka: Toto má svůj důvod a děje se automaticky v dpkg."
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Nelze vytvořit %s"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Zkomolený soubor %s, řádek %lu #1"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nelze přejít do %s"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Zkomolený soubor %s, řádek %lu #2"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Nelze otevřít rouru pro %s"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Zkomolený soubor %s, řádek %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "zápis, stále mám %lu k zápisu, ale nejde to"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Dynamickému MMapu došlo místo. Zvyšte prosím hodnotu APT::Cache-Limit. "
-#~ "Současná hodnota: %lu. (man 5 apt.conf)"
+#~ "Nelze spustit okamžitou konfiguraci již rozbaleného balíku „%s“. "
+#~ "Podrobnosti naleznete v man 5 apt.conf v části APT::Immediate-Configure."
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Přeskakuji neexistující soubor %s"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Při zpracování %s se objevila chyba (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Při zpracování %s se objevila chyba (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Při zpracování %s se objevila chyba (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Chyba při zpracování %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Vnitřní chyba, nemohu nalézt člen"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Interní chyba, skupina „%s“ nemá instalovatelný pseudobalík"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Souboru Release vypršela platnost, ignoruji %s (neplatný již %s)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nelze přistoupit ke klíčence: „%s“"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nelze záplatovat soubor"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Zpracovávám spouštěče pro %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamickému MMapu došlo místo"
+
+#~ 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 ""
+#~ "Protože jste požádali pouze o jednoduchou operaci, je téměř jisté, že\n"
+#~ "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n"
+#~ "(bug report)."
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Řádek %d je příliš dlouhý (max %lu)"
+
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Řádek %d je příliš dlouhý (max %d)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Při zpracování %s se objevila chyba (NewFileDesc2)"
+
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Uložený název: %s \n"
+
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "Nalezl jsem indexy balíků (%i), indexy zdrojů (%i), indexy překladů (%i) "
+#~ "a podpisy (%i)\n"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Datum souboru se změnil %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Čtu seznam souborů"
+
+#~ msgid "Could not execute "
+#~ msgstr "Nelze 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 9ce8a41df..f83831eb6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,17 +7,13 @@ msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:18+0000\n"
-"Last-Translator: Dafydd Harries <Unknown>\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"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
-"2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -25,72 +21,88 @@ msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
 #: cmdline/apt-cache.cc:286
+#, fuzzy
 msgid "Total package names: "
-msgstr ""
+msgstr "Cyfanswm Enwau Pecynnau : "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Cyfanswm Enwau Pecynnau : "
 
 #: cmdline/apt-cache.cc:328
+#, fuzzy
 msgid "  Normal packages: "
-msgstr ""
+msgstr "  Pecynnau Normal: "
 
 #: cmdline/apt-cache.cc:329
+#, fuzzy
 msgid "  Pure virtual packages: "
-msgstr ""
+msgstr "  Pecynnau Cwbl Rhithwir: "
 
 #: cmdline/apt-cache.cc:330
+#, fuzzy
 msgid "  Single virtual packages: "
-msgstr ""
+msgstr "  Pecynnau Rhithwir Sengl: "
 
 #: cmdline/apt-cache.cc:331
+#, fuzzy
 msgid "  Mixed virtual packages: "
-msgstr ""
+msgstr "  Pecynnau Rhithwir Cymysg: "
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
 #: cmdline/apt-cache.cc:334
+#, fuzzy
 msgid "Total distinct versions: "
-msgstr ""
+msgstr "Cyfanswm Fersiynau Gwahanol: "
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Cyfanswm Fersiynau Gwahanol: "
 
 #: cmdline/apt-cache.cc:338
+#, fuzzy
 msgid "Total dependencies: "
-msgstr ""
+msgstr "Cyfanswm Dibyniaethau: "
 
 #: cmdline/apt-cache.cc:341
+#, fuzzy
 msgid "Total ver/file relations: "
-msgstr ""
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 #: cmdline/apt-cache.cc:345
+#, fuzzy
 msgid "Total Provides mappings: "
-msgstr ""
+msgstr "Cyfanswm Mapiau Darpariath: "
 
 #: cmdline/apt-cache.cc:357
+#, fuzzy
 msgid "Total globbed strings: "
-msgstr ""
+msgstr "Cyfanswm Llinynau Glob: "
 
 #: cmdline/apt-cache.cc:371
+#, fuzzy
 msgid "Total dependency version space: "
-msgstr ""
+msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
 #: cmdline/apt-cache.cc:376
+#, fuzzy
 msgid "Total slack space: "
-msgstr ""
+msgstr "Cyfanswm gofod Slac: "
 
 #: cmdline/apt-cache.cc:384
+#, fuzzy
 msgid "Total space accounted for: "
-msgstr ""
+msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -104,8 +116,9 @@ msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -117,8 +130,9 @@ msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
 #: cmdline/apt-cache.cc:1482
+#, fuzzy
 msgid "Package files:"
-msgstr ""
+msgstr "Ffeiliau Pecynnau:"
 
 #: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
@@ -126,8 +140,9 @@ msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
+#, fuzzy
 msgid "Pinned packages:"
-msgstr ""
+msgstr "Pecynnau wedi eu Pinio:"
 
 #: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
@@ -146,23 +161,26 @@ msgid "(none)"
 msgstr "(dim)"
 
 #: cmdline/apt-cache.cc:1557
+#, fuzzy
 msgid "  Package pin: "
-msgstr ""
+msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
+#, fuzzy
 msgid "  Version table:"
-msgstr ""
+msgstr "  Tabl Fersiynnau:"
 
 #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -198,19 +216,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 ""
+"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
+"         apt-cache [opsiynnau] add ffeil1 [ffeil2 ...]\n"
+"         apt-cache [opsiynnau] showpkg pecyn1 [pecyn2 ...]\n"
+"         apt-cache [opsiynnau] showsrc pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
+"deuol APT, ac ymholi gwybodaeth ohonynt\n"
+"\n"
+"Gorchmynion:\n"
+"   add - Ychwanegu ffeil pecyn i'r storfa ffynhonell\n"
+"   gencaches - Adeiladu'r storfeydd pecyn a ffynhonell\n"
+"   showpkg - Dangos gwybodaeth cyffredinol am becyn sengl\n"
+"   showsrc - Dangos cofnodion ffynhonell\n"
+"   stats - Dangos rhyw ystadegau sylfaenol\n"
+"   dump - Dangos y ffeil cyfan mewn ffurf syml\n"
+"   dumpavail - Dangos ffeil argaeledd\n"
+"   unmet - Dangos dibyniaethau heb eu darparu\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 GraphViz\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:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:94
+#, 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:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "Methwyd ailenwi %s at %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -221,6 +278,7 @@ msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
 #: cmdline/apt-config.cc:87
+#, fuzzy
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -235,6 +293,18 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"\n"
+"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
+"\n"
+"Gorchmynion:\n"
+"   shell - Modd plisgyn\n"
+"   dump - Dangod y cyfluniad\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -c=? Darllen y ffeil cyfluniad\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
 #: cmdline/apt-get.cc:135
 msgid "Y"
@@ -292,16 +362,19 @@ msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
 #: cmdline/apt-get.cc:446
+#, fuzzy
 msgid "The following packages have been kept back:"
-msgstr ""
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
 #: cmdline/apt-get.cc:467
+#, fuzzy
 msgid "The following packages will be upgraded:"
-msgstr ""
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
 #: cmdline/apt-get.cc:488
+#, fuzzy
 msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
@@ -313,10 +386,14 @@ msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
 #: cmdline/apt-get.cc:571
+#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
 
 #: cmdline/apt-get.cc:602
 #, c-format
@@ -344,14 +421,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -363,29 +440,35 @@ msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Fersiynau Posib"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
+# FIXME: punctuation
 #: cmdline/apt-get.cc:682
-#, c-format
+#, fuzzy, 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 ""
+"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
+"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+"ffeil sources.list.\n"
 
 #: cmdline/apt-get.cc:700
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -394,19 +477,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -414,9 +497,9 @@ 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:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -429,19 +512,19 @@ msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -472,8 +555,9 @@ msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
 #: cmdline/apt-get.cc:1068
+#, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
@@ -484,8 +568,9 @@ msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
 #: cmdline/apt-get.cc:1081
+#, fuzzy
 msgid "Some packages could not be authenticated"
-msgstr ""
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
@@ -496,12 +581,14 @@ msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
 #: cmdline/apt-get.cc:1140
+#, fuzzy
 msgid "Packages need to be removed but remove is disabled."
-msgstr ""
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
 #: cmdline/apt-get.cc:1151
+#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr ""
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
@@ -524,22 +611,22 @@ msgstr "Mae angen cyrchu %sB o archifau.\n"
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
-msgstr ""
+msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #: cmdline/apt-get.cc:1241
 #, c-format
@@ -555,20 +642,24 @@ msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
 #: cmdline/apt-get.cc:1261
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"
 
 #: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
 msgid "Abort."
 msgstr "Erthylu."
 
 #: cmdline/apt-get.cc:1282
+#, fuzzy
 msgid "Do you want to continue [Y/n]? "
-msgstr ""
+msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -600,8 +691,9 @@ msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
 #: cmdline/apt-get.cc:1389
+#, fuzzy
 msgid "Aborting install."
-msgstr ""
+msgstr "Yn Erthylu'r Sefydliad."
 
 #: cmdline/apt-get.cc:1417
 msgid ""
@@ -623,9 +715,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -662,25 +754,27 @@ msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -689,8 +783,9 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: cmdline/apt-get.cc:1854
+#, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
@@ -740,9 +835,9 @@ msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -751,8 +846,9 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:2183
+#, fuzzy
 msgid "Calculating upgrade... "
-msgstr ""
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -763,8 +859,9 @@ msgid "Done"
 msgstr "Wedi Gorffen"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
+#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
@@ -805,9 +902,9 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:2566
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
 #: cmdline/apt-get.cc:2603
 #, c-format
@@ -829,9 +926,9 @@ msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
 #: cmdline/apt-get.cc:2623
-#, c-format
+#, fuzzy, c-format
 msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Cyrchu Ffynhonell %s\n"
 
 #: cmdline/apt-get.cc:2661
 msgid "Failed to fetch some archives."
@@ -884,11 +981,13 @@ msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -907,18 +1006,22 @@ msgstr ""
 "newydd"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -935,15 +1038,18 @@ msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Yn cysylltu i %s (%s)"
 
 #: cmdline/apt-get.cc:3369
+#, fuzzy
 msgid "Supported modules:"
-msgstr ""
+msgstr "Modylau a Gynhelir:"
 
+# FIXME: split
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -988,6 +1094,46 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Defnydd: apt-get [opsiynnau] gorchymyn\n"
+"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
+"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
+"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
+"ddefnyddir amlaf.\n"
+"\n"
+"Gorchmynion:\n"
+"   update - Cyrchu rhestrau pecynnau newydd\n"
+"   update - Uwchraddio pecynnau wedi sefydlu\n"
+"   install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
+"   remove - Tynnu pecynnau\n"
+"   source - Lawrlwytho archifau ffynhonell\n"
+"   build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
+"   dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
+"   dselect-upgrade - Dilyn dewisiadau dselect\n"
+"   clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
+"   autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
+"   check - Gwirio fod dim dibyniaethau torredig\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn.\n"
+"  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
+"  -qq  Dim allbwn ar wahan i wallau\n"
+"  -d   Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
+"  -s   Peidio gweithredu. Gwneir efelychiad trefn.\n"
+"  -y   Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
+"  -f   Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
+"  -m   Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
+"  -u   Dangos rhestr o archifau a uwchraddir hefyd\n"
+"  -b   Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
+"  -V   Dangos rhifau fersiwn cyflawn\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+"\n"
+"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
+"fwy o wybodaeth ac opsiynnau.\n"
+"\n"
+"                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1024,53 +1170,56 @@ msgid " [Working]"
 msgstr " [Gweithio]"
 
 #: cmdline/acqprogress.cc:286
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 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-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "ond nid yw wedi ei sefydlu"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
-#, c-format
+#, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr ""
+msgstr "Arhoswyd am %s ond nid oedd e yna"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Methwyd agor %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1104,14 +1253,18 @@ msgid "Unable to read the cdrom database %s"
 msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
 
 #: methods/cdrom.cc:212
+#, fuzzy
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."
 
 #: methods/cdrom.cc:222
+#, fuzzy
 msgid "Wrong CD-ROM"
-msgstr ""
+msgstr "CD Anghywir"
 
 #: methods/cdrom.cc:249
 #, c-format
@@ -1120,8 +1273,9 @@ msgstr ""
 "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
 
 #: methods/cdrom.cc:254
+#, fuzzy
 msgid "Disk not found."
-msgstr ""
+msgstr "Ffeil heb ei ganfod"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
@@ -1154,9 +1308,9 @@ msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
 #: methods/ftp.cc:215 methods/ftp.cc:243
-#, c-format
+#, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
-msgstr ""
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
 #: methods/ftp.cc:221
 #, c-format
@@ -1223,8 +1377,9 @@ msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
 #: methods/ftp.cc:713
+#, fuzzy
 msgid "Could not connect passive socket."
-msgstr ""
+msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
 #: methods/ftp.cc:730
@@ -1341,14 +1496,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Methwyd cysylltu i %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1368,8 +1523,9 @@ msgid "Unknown error executing gpgv"
 msgstr ""
 
 #: methods/gpgv.cc:228 methods/gpgv.cc:235
+#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
 #: methods/gpgv.cc:242
 msgid ""
@@ -1390,20 +1546,24 @@ msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
 #: methods/http.cc:569 methods/http.cc:576
+#, fuzzy
 msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
 #: methods/http.cc:606
+#, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
 #: methods/http.cc:621
+#, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
 #: methods/http.cc:623
+#, fuzzy
 msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
 #: methods/http.cc:647
 msgid "Unknown date format"
@@ -1430,16 +1590,18 @@ msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
 #: methods/http.cc:919
+#, fuzzy
 msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
 #: methods/http.cc:921
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
 #: methods/http.cc:1194
+#, fuzzy
 msgid "Bad header data"
-msgstr ""
+msgstr "Data pennawd gwael"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
@@ -1478,9 +1640,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Methwyd agor ffeil %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1523,12 +1685,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1542,15 +1706,18 @@ msgstr ""
 "eto."
 
 #: dselect/update:30
+#, fuzzy
 msgid "Merging available information"
-msgstr ""
+msgstr "Yn cyfuno manylion Ar Gael"
 
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "Nid yw %s yn becyn DEB dilys."
 
+# FIXME: "debian"
 #: cmdline/apt-extracttemplates.cc:236
+#, fuzzy
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1563,6 +1730,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1281
 #, c-format
@@ -1580,9 +1757,9 @@ msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
 #: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
-#, c-format
+#, fuzzy, c-format
 msgid "Error processing directory %s"
-msgstr ""
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1593,11 +1770,13 @@ msgid "Error writing header to contents file"
 msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 
 #: ftparchive/apt-ftparchive.cc:408
-#, c-format
+#, fuzzy, c-format
 msgid "Error processing contents %s"
-msgstr ""
+msgstr "Gwall wrth Brosesu Cynnwys %s"
 
+# FIXME: full stops
 #: ftparchive/apt-ftparchive.cc:596
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1638,6 +1817,45 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             contents llwybr\n"
+"             release llwybr\n"
+"             generate cyfluniad [grŵpiau]\n"
+"             clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+"  -h          Y testun cymorth hwn\n"
+"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
+"  -s=?        Ffeil gwrthwneud ffynhonell\n"
+"  -q          Tawel\n"
+"  -d=?        Dewis cronda data storfa opsiynnol\n"
+"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
+"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
+"  -c=?        Darllen y ffeil cyfluniad hwn\n"
+"  -o=?        Gosod opsiwn cyfluniad mympwyol"
 
 #: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
@@ -1743,7 +1961,7 @@ msgstr "*** Methwyd cysylltu %s at %s"
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " Tarwyd y terfyn cyswllt %sB.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -1760,14 +1978,14 @@ msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
 #: ftparchive/writer.cc:721
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no source override entry\n"
-msgstr ""
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #: ftparchive/writer.cc:725
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr ""
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -1779,19 +1997,19 @@ msgid "Unable to open %s"
 msgstr "Ni ellir agor %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1799,9 +2017,9 @@ msgid "Failed to read the override file %s"
 msgstr "Methwydd darllen y ffeil dargyfeirio %s"
 
 #: ftparchive/multicompress.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr ""
+msgstr "Dull Cywasgu Anhysbys '%s'"
 
 #: ftparchive/multicompress.cc:100
 #, c-format
@@ -1817,13 +2035,14 @@ msgid "Failed to fork"
 msgstr "Methodd fork()"
 
 #: ftparchive/multicompress.cc:206
+#, fuzzy
 msgid "Compress child"
-msgstr ""
+msgstr "Plentyn Cywasgu"
 
 #: ftparchive/multicompress.cc:229
-#, c-format
+#, fuzzy, c-format
 msgid "Internal error, failed to create %s"
-msgstr ""
+msgstr "Gwall Mewnol, Methwyd creu %s"
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
@@ -1843,7 +2062,9 @@ msgstr "Gwall wrth datgysylltu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 
+# FIXME: "debian"
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1856,12 +2077,23 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
 msgstr "Cofnod pecyn anhysbys!"
 
 #: cmdline/apt-sortpkgs.cc:153
+#, fuzzy
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1874,6 +2106,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -s   Defnyddio trefnu ffeil ffynhonell\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
 #: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
@@ -1881,15 +2123,16 @@ msgstr "Methwyd creu pibau"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip "
+msgstr "Methwyd gweithredu gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Archif llygredig"
 
 #: apt-inst/contrib/extracttar.cc:196
+#, fuzzy
 msgid "Tar checksum failed, archive corrupted"
-msgstr ""
+msgstr "Methodd swm gwirio Tar, archif llygredig"
 
 #: apt-inst/contrib/extracttar.cc:303
 #, c-format
@@ -1905,9 +2148,9 @@ msgid "Error reading archive member header"
 msgstr "Gwall wrth ddarllen pennawd aelod archif"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Pennawd aelod archif annilys"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -1934,8 +2177,9 @@ msgid "Failed to allocate diversion"
 msgstr "Methwyd neilltuo dargyfeiriad"
 
 #: apt-inst/filelist.cc:466
+#, fuzzy
 msgid "Internal error in AddDiversion"
-msgstr ""
+msgstr "Gwall Mewnol yn AddDiversion"
 
 #: apt-inst/filelist.cc:479
 #, c-format
@@ -1954,9 +2198,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write file %s"
-msgstr ""
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
@@ -2024,40 +2268,44 @@ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 #: apt-inst/deb/debfile.cc:120
-#, c-format
+#, fuzzy, c-format
 msgid "Internal error, could not locate member %s"
-msgstr ""
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
 #: apt-inst/deb/debfile.cc:214
+#, fuzzy
 msgid "Unparsable control file"
-msgstr ""
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Methwyd agor pibell ar gyfer %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Methwyd gwneud mmap() efo %lu beit"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Ni ellir agor %s"
 
+# FIXME
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Methwyd gweithredu "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2065,8 +2313,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2131,10 +2380,11 @@ msgstr "Yn agor y ffeil cyfluniad %s"
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
 
+# FIXME
 #: apt-pkg/contrib/configuration.cc:792
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
@@ -2163,9 +2413,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2240,9 +2491,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Methwyd gwneud stat() o'r CD-ROM"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Gwall wrth gau'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2291,9 +2542,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2311,9 +2562,9 @@ msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Methwyd agor pibell ar gyfer %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2323,30 +2574,32 @@ msgstr "Methwyd creu isbroses IPC"
 msgid "Failed to exec compressor "
 msgstr "Methwyd gweithredu cywasgydd "
 
+# FIXME
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
+# FIXME
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Gwall wrth gau'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Gwall wrth gyfamseru'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Gwall wrth dadgysylltu'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2365,13 +2618,15 @@ msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
+# FIXME: capitalisation?
 #: apt-pkg/pkgcache.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
@@ -2434,30 +2689,34 @@ msgid "extra"
 msgstr "ychwanegol"
 
 #: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#, fuzzy
 msgid "Building dependency tree"
-msgstr ""
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
 #: apt-pkg/depcache.cc:133
+#, fuzzy
 msgid "Candidate versions"
-msgstr ""
+msgstr "Fersiynau Posib"
 
 #: apt-pkg/depcache.cc:162
+#, fuzzy
 msgid "Dependency generation"
-msgstr ""
+msgstr "Cynhyrchaid Dibyniaeth"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "Yn cyfuno manylion Ar Gael"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "Methwyd agor %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 # FIXME: number?
 #: apt-pkg/tagfile.cc:129
@@ -2471,29 +2730,33 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2511,9 +2774,9 @@ 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:143
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
 
 #: apt-pkg/sourcelist.cc:150
 #, c-format
@@ -2537,9 +2800,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 
 #: apt-pkg/sourcelist.cc:289
-#, c-format
+#, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
 #: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2549,9 +2812,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Methwyd agor ffeil %s"
 
 # FIXME: %s may have an arbirrary length
 #: apt-pkg/packagemanager.cc:545
@@ -2592,25 +2855,28 @@ msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2620,9 +2886,9 @@ msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #: apt-pkg/acquire.cc:895
-#, c-format
+#, fuzzy, c-format
 msgid "Retrieving file %li of %li"
-msgstr ""
+msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -2635,9 +2901,12 @@ msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
 #: apt-pkg/acquire-worker.cc:440
-#, c-format
+#, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' 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"
 
 #: apt-pkg/init.cc:152
 #, c-format
@@ -2645,8 +2914,9 @@ msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
 #: apt-pkg/init.cc:168
+#, fuzzy
 msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+msgstr "Ni ellir canfod math system addas"
 
 #: apt-pkg/clean.cc:57
 #, c-format
@@ -2677,10 +2947,11 @@ msgid ""
 "available in the sources"
 msgstr ""
 
+# FIXME: literal
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
 #: apt-pkg/policy.cc:418
@@ -2706,9 +2977,9 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2720,8 +2991,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2740,8 +3012,9 @@ msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
 #: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
+#, fuzzy
 msgid "Reading package lists"
-msgstr ""
+msgstr "Yn Darllen Rhestrau Pecynnau"
 
 #: apt-pkg/pkgcachegen.cc:1197
 msgid "Collecting File Provides"
@@ -2762,8 +3035,9 @@ msgstr "Camgyfatebiaeth swm MD5"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "Camgyfatebiaeth swm MD5"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2772,10 +3046,11 @@ msgid ""
 "or malformed file)"
 msgstr ""
 
+# FIXME: number?
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2836,15 +3111,16 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
+# FIXME: number?
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2852,14 +3128,15 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 
+# FIXME: number?
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2883,8 +3160,9 @@ msgid "Stored label: %s\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "CD Anghywir"
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -2896,8 +3174,9 @@ msgid "Unmounting CD-ROM\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:665
+#, fuzzy
 msgid "Waiting for disc...\n"
-msgstr ""
+msgstr "Yn aros am benawdau"
 
 #: apt-pkg/cdrom.cc:674
 msgid "Mounting CD-ROM...\n"
@@ -2937,12 +3216,14 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:830
+#, fuzzy
 msgid "Copying package lists..."
-msgstr ""
+msgstr "Yn Darllen Rhestrau Pecynnau"
 
 #: apt-pkg/cdrom.cc:857
+#, fuzzy
 msgid "Writing new source list\n"
-msgstr ""
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
 #: apt-pkg/cdrom.cc:865
 msgid "Source list entries for this disc are:\n"
@@ -2974,9 +3255,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Camgyfatebiaeth swm MD5"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -2985,9 +3266,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Yn Erthylu'r Sefydliad."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -2997,17 +3278,17 @@ msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 #: apt-pkg/cacheset.cc:406
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s'"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Methwyd canfod pecyn %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Methwyd canfod pecyn %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3057,24 +3338,24 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "  Wedi Sefydlu: "
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
-#, c-format
+#, fuzzy, c-format
 msgid "Configuring %s"
-msgstr ""
+msgstr "Yn cysylltu i %s"
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
-#, c-format
+#, fuzzy, c-format
 msgid "Removing %s"
-msgstr ""
+msgstr "Yn agor %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "Methwyd dileu %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3088,34 +3369,34 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Methwyd agor ffeil %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing %s"
-msgstr ""
+msgstr "Yn agor %s"
 
 #: apt-pkg/deb/dpkgpm.cc:945
-#, c-format
+#, fuzzy, c-format
 msgid "Unpacking %s"
-msgstr ""
+msgstr "Yn agor %s"
 
 #: apt-pkg/deb/dpkgpm.cc:950
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Yn agor y ffeil cyfluniad %s"
 
 #: apt-pkg/deb/dpkgpm.cc:952
-#, c-format
+#, fuzzy, c-format
 msgid "Installed %s"
-msgstr ""
+msgstr "  Wedi Sefydlu: "
 
 #: apt-pkg/deb/dpkgpm.cc:957
 #, c-format
@@ -3123,19 +3404,19 @@ msgid "Preparing for removal of %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:959
-#, c-format
+#, fuzzy, c-format
 msgid "Removed %s"
-msgstr ""
+msgstr "Argymell"
 
 #: apt-pkg/deb/dpkgpm.cc:964
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing to completely remove %s"
-msgstr ""
+msgstr "Yn agor y ffeil cyfluniad %s"
 
 #: apt-pkg/deb/dpkgpm.cc:965
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removed %s"
-msgstr ""
+msgstr "Methwyd dileu %s"
 
 #: apt-pkg/deb/dpkgpm.cc:1208
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
@@ -3195,9 +3476,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3211,64 +3492,229 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Yn agor y ffeil cyfluniad %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Gwall darllen o broses %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Methwyd dileu %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Methwyd agor pibell ar gyfer %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni ellir creu %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Methwyd stat() ar %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Methwyd newid i %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+# FIXME
+#, fuzzy
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+#, fuzzy
+#~ msgid "Reading file listing"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+#~ 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 ""
+#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn "
+#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+
+# FIXME
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+
+#, fuzzy
+#~ msgid "Internal error getting a node"
+#~ msgstr "Gwall Mewnol wrth gael Nôd"
 
 # FIXME: literal
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
 
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+#, fuzzy
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#, fuzzy
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
+
+#, fuzzy
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Methwyd newid i %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "datgywasgydd"
+
 # FIXME
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+
+# FIXME
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "o hyd %lu i ysgrifennu ond methwyd"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
+#, fuzzy
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+
+#, fuzzy
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Gwall Methwyd, methwyd lleoli aelod"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
+
+#, fuzzy
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Methwyd datrys '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Methwyd agor ffeil %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+# FIXME: commas, wrapping
 #~ 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!"
+#~ "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 ""
-#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn "
-#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+#~ "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."
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Methwyd stat() ar %sinfo"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Ni ellir creu %s"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Methwyd dileu %s"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Methwyd dewis"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Dyddiad ffeil wedi newid %s"
+
+#, fuzzy
+#~ msgid "Reading file list"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Methwyd cael y clo %s"
+
+#~ msgid "Abort? [Y/n] "
+#~ msgstr "Erthylu? [I/n] "
+
+#~ msgid "Write Error"
+#~ msgstr "Gwall Ysgrifennu"
 
-#~ 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"
+#~ msgid "File Not Found"
+#~ msgstr "Ni Chanfuwyd Y Ffeil"
diff --git a/po/da.po b/po/da.po
index 27d6c7a4c..c7557dfc0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,16 +11,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:16+0000\n"
-"Last-Translator: Joe Hansen <Unknown>\n"
+"PO-Revision-Date: 2012-07-03 23:51+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -77,7 +75,7 @@ msgstr "Sammenlagt version/fil-relationer: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "Sammenlagt 'Tilbyder'-markeringer: "
+msgstr "Sammenlagt »Tilbyder«-markeringer: "
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
@@ -89,7 +87,7 @@ msgstr "Total afhængighedsversions-plads: "
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Total 'Slack'-plads: "
+msgstr "Total »Slack«-plads: "
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -133,7 +131,7 @@ msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
-msgstr "'Pinned' pakker:"
+msgstr "»Pinned« pakker:"
 
 #: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
@@ -217,7 +215,7 @@ msgstr ""
 "   showsrc - Vis kildetekstposter\n"
 "   stats - Vis nogle grundlæggende statistikker\n"
 "   dump - Vis hele filen i kort form\n"
-"   dumpavail - Udlæs en 'available'-fil til standard-ud\n"
+"   dumpavail - Udlæs en »available«-fil til standard-ud\n"
 "   unmet - Vis uopfyldte afhængigheder\n"
 "   search - Gennemsøg pakkelisten med et regulært udtryk\n"
 "   show - Vis en læsbar post for pakken\n"
@@ -232,8 +230,8 @@ msgstr ""
 "  -h   Denne hjælpetekst.\n"
 "  -p=? Pakkemellemlageret.\n"
 "  -s=? Kildemellemlageret.\n"
-"  -q   Deaktivér fremgangsindikatoren.\n"
-"  -i   Vis kun vigtige afhængigheder for kommandoen 'unmet'.\n"
+"  -q   Deaktiver fremgangsindikatoren.\n"
+"  -i   Vis kun vigtige afhængigheder for kommandoen »unmet«.\n"
 "  -c=? Læs denne opsætningsfil\n"
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
@@ -241,7 +239,7 @@ msgstr ""
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
-"Angiv venligst et navn for denne disk, som f.eks. 'Debian 5.0.3 Disk 1'"
+"Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
@@ -400,12 +398,12 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
 #: cmdline/apt-get.cc:635
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Bemærk, vælger '%s' til opgave '%s'\n"
+msgstr "Bemærk, vælger »%s« til opgave »%s«\n"
 
 #: cmdline/apt-get.cc:640
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Bemærk, vælger '%s' for regulært udtryk '%s'\n"
+msgstr "Bemærk, vælger »%s« for regulært udtryk »%s«\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -442,12 +440,12 @@ msgstr "Dog kan følgende pakker erstatte den:"
 #: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Pakken '%s' har ingen installationskandidat"
+msgstr "Pakken »%s« har ingen installationskandidat"
 
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtuelle pakker som '%s' kan ikke fjernes\n"
+msgstr "Virtuelle pakker som »%s« kan ikke fjernes\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -464,7 +462,7 @@ msgstr "Pakken »%s« er ikke installeret, så den afinstalleres ikke\n"
 #: cmdline/apt-get.cc:788
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Bemærk, vælger '%s' fremfor '%s'\n"
+msgstr "Bemærk, vælger »%s« fremfor »%s«\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -498,16 +496,16 @@ msgstr "%s sat til manuelt installeret.\n"
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valgte version '%s' (%s) for '%s'\n"
+msgstr "Valgte version »%s« (%s) for »%s«\n"
 
 #: cmdline/apt-get.cc:889
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valgte version '%s' (%s) for '%s' på grund af '%s'\n"
+msgstr "Valgte version »%s« (%s) for »%s« på grund af »%s«\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
-msgstr "Retter afhængigheder..."
+msgstr "Retter afhængigheder ..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
@@ -770,7 +768,7 @@ msgstr "Intern fejl, AllUpgrade ødelagde noget"
 
 #: cmdline/apt-get.cc:1953
 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':"
+msgstr "Du kan muligvis rette det ved at køre »apt-get -f install«:"
 
 #: cmdline/apt-get.cc:1957
 msgid ""
@@ -1130,7 +1128,7 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "Tjekkede "
+msgstr "Havde "
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
@@ -1833,7 +1831,7 @@ msgstr ""
 "med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
 "angive en src-tvangsfil.\n"
 "\n"
-"Kommandoerne 'packages' og 'sources' skal køres i roden af træet.\n"
+"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n"
 "binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
 "skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
 "filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
@@ -1858,7 +1856,7 @@ msgstr "Ingen valg passede"
 #: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Visse filer mangler i pakkefilgruppen '%s'"
+msgstr "Visse filer mangler i pakkefilgruppen »%s«"
 
 #: ftparchive/cachedb.cc:47
 #, c-format
@@ -1941,7 +1939,7 @@ msgstr " DeLink %s [%s]\n"
 #: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "Kunne ikke 'readlink' %s"
+msgstr "Kunne ikke »readlink« %s"
 
 #: ftparchive/writer.cc:279
 #, c-format
@@ -2015,7 +2013,7 @@ msgstr "Kunne ikke læse gennemtvangsfilen %s"
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "Ukendt komprimeringsalgoritme '%s'"
+msgstr "Ukendt komprimeringsalgoritme »%s«"
 
 #: ftparchive/multicompress.cc:100
 #, c-format
@@ -2782,7 +2780,7 @@ msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"Kunne ikke udføre øjeblikkelig konfiguration på '%s'. Se venligst man 5 apt."
+"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt."
 "conf under APT:Immediate-Cinfigure for detaljer. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
@@ -2799,13 +2797,13 @@ msgid ""
 msgstr ""
 "Kørsel af denne installation kræver midlertidig afinstallation af den "
 "essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig "
-"idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-"
-"LoopBreak'."
+"ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-"
+"LoopBreak«."
 
 #: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen '%s' understøttes ikke"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
 
 #: apt-pkg/algorithms.cc:261
 #, c-format
@@ -3125,7 +3123,7 @@ msgstr "Identificerer.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Gemt mærkat: %s\n"
+msgstr "Gemt mærkat: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3185,7 +3183,7 @@ msgid ""
 "'%s'\n"
 msgstr ""
 "Denne disk hedder: \n"
-" %s\n"
+" %s \n"
 
 #: apt-pkg/cdrom.cc:830
 msgid "Copying package lists..."
@@ -3467,56 +3465,35 @@ msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet. "
+msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Ikke låst"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "Læsefejl fra %s-process"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Kunne ikke åbne datarør for %s"
-
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Kunne ikke finde en gyldig kontrolfil"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Kunne ikke skifte til %s"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Fejl under tolkning af MD5. Forskydning %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Kunne ikke finde et Package:-hovede, forskydning %lu"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Springer ikkeeksisterende fil over %s"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "pkg-mellemlageret skal initialiseres først"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Kunne ikke slette %s"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Intern fejl under tilføjelse af omrokering"
+#~ msgid "Unable to create %s"
+#~ msgstr "Kunne ikke oprette %s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Ugyldig linje i omrokeringsfilen: %s"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Kunne ikke finde %sinfo"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Pakkeomrokeringsfilen er ødelagt"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Mapperne info og temp skal ligge i samme filsystem"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Kunne ikke åbne omrokeringsfilen %sdiversions"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Kunne ikke skifte til admin-mappen %sinfo"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Intern fejl under hentning af knude"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Intern fejl under hentning af et pakkenavn"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Kunne ikke læse listefilen %sinfo/%s"
+#~ msgid "Reading file listing"
+#~ msgstr "Læser fillisten"
 
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -3527,111 +3504,47 @@ msgstr "Ikke låst"
 #~ "fil, kan du gøre dem tom og med det samme geninstallere den samme version "
 #~ "af pakken!"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Læser fillisten"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Kunne ikke læse listefilen %sinfo/%s"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Intern fejl under hentning af et pakkenavn"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Intern fejl under hentning af knude"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Kunne ikke skifte til admin-mappen %sinfo"
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Kunne ikke åbne omrokeringsfilen %sdiversions"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Mapperne info og temp skal ligge i samme filsystem"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Pakkeomrokeringsfilen er ødelagt"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Kunne ikke finde %sinfo"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Ugyldig linje i omrokeringsfilen: %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Kunne ikke oprette %s"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Intern fejl under tilføjelse af omrokering"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Kunne ikke slette %s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "pkg-mellemlageret skal initialiseres først"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Brug 'apt-get autoremove' til at fjerne dem."
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Kunne ikke finde et Package:-hovede, forskydning %lu"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Ugyldig ConfFile-afsnit i statusfilen. Forskydning %lu"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Fejl under tolkning af MD5. Forskydning %lu"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-"
-#~ "Limit. Aktuel værdi: %lu. (man 5 apt.conf)"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Kunne ikke skifte til %s"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Springer ikkeeksisterende fil over %s"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Kunne ikke finde en gyldig kontrolfil"
 
-#~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
-#~ msgstr ""
-#~ "Brug: apt-mark [tilvalg] {auto|manual} pakke1 [pakke2 ...]\n"
-#~ "\n"
-#~ "apt-mark er en simpel kommandolinjegrænseflade for markering af pakker\n"
-#~ "som manuelt eller automatisk installeret. Programmet kan også vise\n"
-#~ "markeringerne.\n"
-#~ "\n"
-#~ "Kommandoer:\n"
-#~ "   auto - Marker de givne pakker som automatisk installeret\n"
-#~ "   manual - Marker de givne pakker som manuelt installeret\n"
-#~ "\n"
-#~ "Tilvalg:\n"
-#~ "  -h  Denne hjælpetekst.\n"
-#~ "  -q  Logbar uddata - ingen statusindikator\n"
-#~ "  -qq Ingen uddata undtagen for fejl\n"
-#~ "  -s  Ingen handling. Viser kun hvad der ville blive udført.\n"
-#~ "  -f  læs/skriv auto/manuel markering i den givne fil\n"
-#~ "  -c=? Læs denne konfigurationsfil\n"
-#~ "  -o=? Angiv en arbitrær konfigurationsindstilling, f.eks. -o dir::cache=/"
-#~ "tmp\n"
-#~ "Se manualsiderne apt-mark(8) og apt.conf(5) for yderligere information."
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Kunne ikke åbne datarør for %s"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Brug: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver er en grænseflade, der skal bruge den aktuelle\n"
-#~ "interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
-#~ "eller lignende\n"
-#~ "\n"
-#~ "Tilvalg:\n"
-#~ " -h   Denne hjælpetekst.\n"
-#~ " -q   Logbare uddata - ingen statusindikator\n"
-#~ " -c=? Læs denne konfigurationsfil\n"
-#~ " -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
-#~ "apt.conf(5)-manualsider for yderligere information og indstillinger.\n"
-#~ "                       Denne APT har Super Cow Powers.\n"
+#~ msgid "Read error from %s process"
+#~ msgstr "Læsefejl fra %s-process"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
diff --git a/po/de.po b/po/de.po
index 853305f4a..a7147bfd6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,16 +11,14 @@ msgstr ""
 "Project-Id-Version: apt 0.9.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:24+0000\n"
-"Last-Translator: Holger Wansing <Unknown>\n"
+"PO-Revision-Date: 2012-06-27 10:55+0200\n"
+"Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);>\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -119,7 +117,7 @@ msgstr ""
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "Paket %s kann nicht gefunden werden"
+msgstr "Paket %s kann nicht gefunden werden."
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
@@ -127,7 +125,9 @@ msgstr "Paketdateien:"
 
 #: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Cache ist nicht synchron, Querverweisen einer Paketdatei nicht möglich"
+msgstr ""
+"Zwischenspeicher ist nicht synchron, Querverweisen einer Paketdatei nicht "
+"möglich"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
@@ -144,7 +144,7 @@ msgstr "  Installiert: "
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  Kandidat: "
+msgstr "  Installationskandidat: "
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -248,12 +248,12 @@ msgstr ""
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die "
-"Eingabetaste (Enter)"
+"Eingabetaste (Enter)."
 
 #: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "»%s« konnte nicht in »%s« eingebunden werden"
+msgstr "»%s« konnte nicht in »%s« eingebunden werden."
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -424,7 +424,7 @@ msgstr " [Installiert]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [Nicht der Installationskandidat]"
+msgstr " [Nicht die Installationskandidat-Version]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -448,12 +448,12 @@ msgstr "Doch die folgenden Pakete ersetzen es:"
 #: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Paket »%s« hat keinen Installationskandidaten"
+msgstr "Für Paket »%s« existiert kein Installationskandidat."
 
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtuelle Pakete wie »%s« können nicht entfernt werden\n"
+msgstr "Virtuelle Pakete wie »%s« können nicht entfernt werden.\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
@@ -471,7 +471,7 @@ msgstr "Paket »%s« ist nicht installiert, wird also auch nicht entfernt.\n"
 #: cmdline/apt-get.cc:788
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt\n"
+msgstr "Hinweis: »%s« wird an Stelle von »%s« gewählt.\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -507,7 +507,7 @@ msgstr "%s wurde als manuell installiert festgelegt.\n"
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Version »%s« (%s) für »%s« gewählt\n"
+msgstr "Version »%s« (%s) für »%s« gewählt.\n"
 
 #: cmdline/apt-get.cc:889
 #, c-format
@@ -516,7 +516,7 @@ msgstr "Version »%s« (%s) für »%s« gewählt aufgrund von »%s«.\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
-msgstr "Abhängigkeiten werden korrigiert..."
+msgstr "Abhängigkeiten werden korrigiert ..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
@@ -524,11 +524,11 @@ msgstr " fehlgeschlagen."
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
-msgstr "Abhängigkeiten konnten nicht korrigiert werden"
+msgstr "Abhängigkeiten konnten nicht korrigiert werden."
 
 #: cmdline/apt-get.cc:1034
 msgid "Unable to minimize the upgrade set"
-msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden"
+msgstr "Menge der zu aktualisierenden Pakete konnte nicht minimiert werden."
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
@@ -556,11 +556,11 @@ msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
-msgstr "Einige Pakete konnten nicht authentifiziert werden"
+msgstr "Einige Pakete konnten nicht authentifiziert werden."
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
-msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
+msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet."
 
 #: cmdline/apt-get.cc:1131
 msgid "Internal error, InstallPackages was called with broken packages!"
@@ -612,7 +612,7 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 #: cmdline/apt-get.cc:2592
 #, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Freier Platz in %s konnte nicht bestimmt werden"
+msgstr "Freier Platz in %s konnte nicht bestimmt werden."
 
 #: cmdline/apt-get.cc:1241
 #, c-format
@@ -653,7 +653,7 @@ msgstr "Fehlschlag beim Holen von %s  %s\n"
 
 #: cmdline/apt-get.cc:1372
 msgid "Some files failed to download"
-msgstr "Einige Dateien konnten nicht heruntergeladen werden"
+msgstr "Einige Dateien konnten nicht heruntergeladen werden."
 
 #: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
 msgid "Download complete and in download only mode"
@@ -669,7 +669,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1383
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt"
+msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt."
 
 #: cmdline/apt-get.cc:1388
 msgid "Unable to correct missing packages."
@@ -700,27 +700,27 @@ msgstr "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
 #: cmdline/apt-get.cc:1559
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert"
+msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert."
 
 #: cmdline/apt-get.cc:1591
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Als Quellpaket wird »%s« statt »%s« gewählt\n"
+msgstr "Als Quellpaket wird »%s« statt »%s« gewählt.\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert"
+msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert."
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
-msgstr "Der Befehl »update« akzeptiert keine Argumente"
+msgstr "Der Befehl »update« akzeptiert keine Argumente."
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
-"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden"
+"Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden."
 
 #: cmdline/apt-get.cc:1815
 msgid ""
@@ -748,7 +748,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1822
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Interner Fehler, AutoRemover hat etwas beschädigt"
+msgstr "Interner Fehler, AutoRemover hat etwas beschädigt."
 
 #: cmdline/apt-get.cc:1829
 msgid ""
@@ -781,7 +781,7 @@ msgstr[1] "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt"
+msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt."
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
@@ -855,7 +855,7 @@ msgstr "Fertig"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt"
+msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt."
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
@@ -877,12 +877,12 @@ msgstr "Herunterladen von %s %s"
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
-"sollen"
+"sollen."
 
 #: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "Quellpaket für %s kann nicht gefunden werden"
+msgstr "Quellpaket für %s kann nicht gefunden werden."
 
 #: cmdline/apt-get.cc:2508
 #, c-format
@@ -914,7 +914,7 @@ msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n"
 #: cmdline/apt-get.cc:2603
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "Sie haben nicht genügend freien Speicherplatz in %s"
+msgstr "Sie haben nicht genügend freien Speicherplatz in %s."
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -1166,11 +1166,11 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "OK "
+msgstr "OK   "
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
-msgstr "Hole:"
+msgstr "Holen: "
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
@@ -1183,7 +1183,7 @@ msgstr "Fehl "
 #: cmdline/acqprogress.cc:140
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Es wurden %sB in %s geholt (%sB/s)\n"
+msgstr "Es wurden %sB in %s geholt (%sB/s).\n"
 
 #: cmdline/acqprogress.cc:230
 #, c-format
@@ -1292,7 +1292,7 @@ msgstr ""
 #: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "CD-ROM-Datenbank %s kann nicht gelesen werden"
+msgstr "CD-ROM-Datenbank %s kann nicht gelesen werden."
 
 #: methods/cdrom.cc:212
 msgid ""
@@ -1300,7 +1300,7 @@ msgid ""
 "cannot be used to add new CD-ROMs"
 msgstr ""
 "Bitte verwenden Sie apt-cdrom, um APT diese CD-ROM bekannt zu machen. apt-"
-"get update kann nicht dazu verwendet werden, neue CD-ROMs hinzuzufügen"
+"get update kann nicht dazu verwendet werden, neue CD-ROMs hinzuzufügen."
 
 #: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
@@ -1315,7 +1315,7 @@ msgstr ""
 
 #: methods/cdrom.cc:254
 msgid "Disk not found."
-msgstr "Medium nicht gefunden."
+msgstr "Medium nicht gefunden"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
@@ -1325,15 +1325,15 @@ msgstr "Datei nicht gefunden"
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
 msgid "Failed to stat"
-msgstr "»stat« konnte nicht ausgeführt werden"
+msgstr "Abfrage mit »stat« fehlgeschlagen"
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
-msgstr "Änderungszeitpunkt kann nicht gesetzt werden"
+msgstr "Änderungszeitpunkt kann nicht gesetzt werden."
 
 #: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen"
+msgstr "Ungültige URI, lokale URIs dürfen nicht mit // beginnen."
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:173
@@ -1342,11 +1342,11 @@ msgstr "Anmeldung läuft"
 
 #: methods/ftp.cc:179
 msgid "Unable to determine the peer name"
-msgstr "Name des Kommunikationspartners kann nicht bestimmt werden"
+msgstr "Name des Kommunikationspartners kann nicht bestimmt werden."
 
 #: methods/ftp.cc:184
 msgid "Unable to determine the local name"
-msgstr "Lokaler Name kann nicht bestimmt werden"
+msgstr "Lokaler Name kann nicht bestimmt werden."
 
 #: methods/ftp.cc:215 methods/ftp.cc:243
 #, c-format
@@ -1410,11 +1410,11 @@ msgstr "Schreibfehler"
 
 #: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
 msgid "Could not create a socket"
-msgstr "Socket konnte nicht erzeugt werden"
+msgstr "Socket konnte nicht erzeugt werden."
 
 #: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
-msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden"
+msgstr "Daten-Socket konnte wegen Zeitüberschreitung nicht verbunden werden."
 
 #: methods/ftp.cc:713
 msgid "Could not connect passive socket."
@@ -1424,7 +1424,7 @@ msgstr "Passiver Socket konnte nicht verbunden werden."
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 "Von der Funktion getaddrinfo wurde kein auf Verbindungen wartender Socket "
-"gefunden"
+"gefunden."
 
 #: methods/ftp.cc:744
 msgid "Could not bind a socket"
@@ -1436,11 +1436,11 @@ msgstr "Warten auf Verbindungen auf dem Socket nicht möglich"
 
 #: methods/ftp.cc:755
 msgid "Could not determine the socket's name"
-msgstr "Name des Sockets konnte nicht bestimmt werden"
+msgstr "Name des Sockets konnte nicht bestimmt werden."
 
 #: methods/ftp.cc:787
 msgid "Unable to send PORT command"
-msgstr "PORT-Befehl konnte nicht gesendet werden"
+msgstr "PORT-Befehl konnte nicht gesendet werden."
 
 #: methods/ftp.cc:797
 #, c-format
@@ -1458,7 +1458,7 @@ msgstr "Zeitüberschreitung bei Datenverbindungsaufbau"
 
 #: methods/ftp.cc:833
 msgid "Unable to accept connection"
-msgstr "Verbindung konnte nicht angenommen werden"
+msgstr "Verbindung konnte nicht angenommen werden."
 
 #: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
 msgid "Problem hashing file"
@@ -1500,7 +1500,7 @@ msgstr "[IP: %s %s]"
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)"
+msgstr "Socket für %s konnte nicht erzeugt werden (f=%u t=%u p=%u)."
 
 #: methods/connect.cc:99
 #, c-format
@@ -1512,12 +1512,12 @@ msgstr "Verbindung mit %s:%s kann nicht aufgebaut werden (%s)."
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 "Verbindung mit %s:%s konnte nicht aufgebaut werden (%s), eine "
-"Zeitüberschreitung trat auf"
+"Zeitüberschreitung trat auf."
 
 #: methods/connect.cc:125
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
-msgstr "Verbindung mit %s:%s nicht möglich (%s)."
+msgstr "Verbindung mit %s:%s nicht möglich (%s)"
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
@@ -1529,7 +1529,7 @@ msgstr "Verbindung mit %s"
 #: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "»%s« konnte nicht aufgelöst werden"
+msgstr "»%s« konnte nicht aufgelöst werden."
 
 #: methods/connect.cc:197
 #, c-format
@@ -1539,7 +1539,7 @@ msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 #: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)"
+msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
 
 #: methods/connect.cc:247
 #, c-format
@@ -1594,16 +1594,17 @@ msgstr "Ungültige Kopfzeile"
 
 #: methods/http.cc:569 methods/http.cc:576
 msgid "The HTTP server sent an invalid reply header"
-msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt"
+msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt."
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
-"Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt"
+"Vom HTTP-Server wurde eine ungültige »Content-Length«-Kopfzeile gesandt."
 
 #: methods/http.cc:621
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt"
+msgstr ""
+"Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesandt."
 
 #: methods/http.cc:623
 msgid "This HTTP server has broken range support"
@@ -1638,7 +1639,7 @@ msgstr "Fehler beim Schreiben der Datei"
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
-"anderen Seite geschlossen"
+"anderen Seite geschlossen."
 
 #: methods/http.cc:921
 msgid "Error reading from server"
@@ -1665,7 +1666,7 @@ msgstr "Interner Fehler"
 #: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
 #, c-format
 msgid "Unable to read %s"
-msgstr "%s kann nicht gelesen werden"
+msgstr "%s kann nicht gelesen werden."
 
 #: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
 #: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
@@ -1673,14 +1674,14 @@ msgstr "%s kann nicht gelesen werden"
 #: apt-pkg/clean.cc:123
 #, c-format
 msgid "Unable to change to %s"
-msgstr "Es konnte nicht nach %s gewechselt werden"
+msgstr "Es konnte nicht nach %s gewechselt werden."
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Keine Datei von Spiegelserver »%s« gefunden "
+msgstr "Keine Datei von Spiegelserver »%s« gefunden"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1715,7 +1716,7 @@ msgstr ""
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
-"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden"
+"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
@@ -1757,7 +1758,7 @@ msgstr ""
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "Verfügbare Informationen werden zusammengeführt"
+msgstr "Verfügbare Informationen werden zusammengeführt."
 
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
@@ -1800,7 +1801,7 @@ msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
-msgstr "Paketerweiterungsliste ist zu lang"
+msgstr "Paketerweiterungsliste ist zu lang."
 
 #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
 #: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
@@ -1811,7 +1812,7 @@ msgstr "Fehler beim Verarbeiten von Verzeichnis %s"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
-msgstr "Quellerweiterungsliste ist zu lang"
+msgstr "Quellerweiterungsliste ist zu lang."
 
 #: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
@@ -1903,7 +1904,7 @@ msgstr ""
 "  --md5        MD5-Hashes erzeugen\n"
 "  -s=?         Override-Datei für Quellen\n"
 "  -q           ruhig\n"
-"  -d=?         optionale Cache-Datenbank auswählen\n"
+"  -d=?         optionale Zwischenspeicher-Datenbank auswählen\n"
 "  --no-delink  Debug-Modus für Delinking aktivieren\n"
 "  --contents   Inhaltsdatei erzeugen\n"
 "  -c=?         diese Konfigurationsdatei lesen\n"
@@ -1916,7 +1917,7 @@ msgstr "Keine Auswahl traf zu"
 #: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«"
+msgstr "Einige Dateien fehlen in der Paketdateigruppe »%s«."
 
 #: ftparchive/cachedb.cc:47
 #, c-format
@@ -1926,7 +1927,7 @@ msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old"
 #: ftparchive/cachedb.cc:65
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern"
+msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern."
 
 #: ftparchive/cachedb.cc:76
 msgid ""
@@ -1946,11 +1947,11 @@ msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s"
 #: apt-inst/extract.cc:210
 #, c-format
 msgid "Failed to stat %s"
-msgstr "Ausführen von »stat« auf %s fehlgeschlagen"
+msgstr "%s mit »stat« abfragen fehlgeschlagen"
 
 #: ftparchive/cachedb.cc:249
 msgid "Archive has no control record"
-msgstr "Archiv hat keinen Steuerungsdatensatz"
+msgstr "Archiv hat keinen Steuerungsdatensatz."
 
 #: ftparchive/cachedb.cc:490
 msgid "Unable to get a cursor"
@@ -1959,12 +1960,12 @@ msgstr "Unmöglich, einen Cursor zu bekommen"
 #: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "W: Verzeichnis %s kann nicht gelesen werden\n"
+msgstr "W: Verzeichnis %s kann nicht gelesen werden.\n"
 
 #: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "W: Ausführen von »stat« auf %s nicht möglich\n"
+msgstr "W: %s mit »stat« abfragen nicht möglich.\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
@@ -1981,7 +1982,7 @@ msgstr "F: Fehler gehören zu Datei "
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "%s konnte nicht aufgelöst werden"
+msgstr "%s konnte nicht aufgelöst werden."
 
 #: ftparchive/writer.cc:181
 msgid "Tree walking failed"
@@ -2015,7 +2016,7 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-Limit von %sB erreicht.\n"
+msgstr " DeLink-Limit von %sB erreicht\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -2048,7 +2049,7 @@ msgstr "realloc - Speicheranforderung fehlgeschlagen"
 #: ftparchive/override.cc:35 ftparchive/override.cc:143
 #, c-format
 msgid "Unable to open %s"
-msgstr "%s konnte nicht geöffnet werden"
+msgstr "%s konnte nicht geöffnet werden."
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
 #, c-format
@@ -2068,7 +2069,7 @@ msgstr "Missgestaltetes Override %s Zeile %llu #3"
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "Override-Datei %s konnte nicht gelesen werden"
+msgstr "Override-Datei %s konnte nicht gelesen werden."
 
 #: ftparchive/multicompress.cc:70
 #, c-format
@@ -2078,11 +2079,11 @@ msgstr "Unbekannter Komprimierungsalgorithmus »%s«"
 #: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz"
+msgstr "Komprimierte Ausgabe %s benötigt einen Komprimierungssatz."
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
-msgstr "FILE* konnte nicht erzeugt werden"
+msgstr "FILE* konnte nicht erzeugt werden."
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
@@ -2095,7 +2096,7 @@ msgstr "Komprimierungs-Kindprozess"
 #: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "Interner Fehler, %s konnte nicht erzeugt werden"
+msgstr "Interner Fehler, %s konnte nicht erzeugt werden."
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
@@ -2113,7 +2114,7 @@ msgstr "Problem beim Entfernen (unlink) von %s"
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "%s konnte nicht in %s umbenannt werden"
+msgstr "%s konnte nicht in %s umbenannt werden."
 
 #: cmdline/apt-internal-solver.cc:37
 msgid ""
@@ -2171,11 +2172,11 @@ msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
-msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden"
+msgstr "Pipes (Weiterleitungen) konnten nicht erzeugt werden."
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "gzip konnte nicht ausgeführt werden "
+msgstr "gzip konnte nicht ausgeführt werden."
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2209,11 +2210,11 @@ msgstr "Ungültige Archivdatei-Kopfzeilen"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
-msgstr "Archiv ist zu kurz"
+msgstr "Archiv ist zu kurz."
 
 #: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
-msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden"
+msgstr "Archiv-Kopfzeilen konnten nicht gelesen werden."
 
 #: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
@@ -2225,7 +2226,7 @@ msgstr "Hash-Element konnte nicht gefunden werden!"
 
 #: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
-msgstr "Umleitung konnte nicht reserviert werden"
+msgstr "Umleitung konnte nicht reserviert werden."
 
 #: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
@@ -2249,17 +2250,17 @@ msgstr "Doppelte Konfigurationsdatei %s/%s"
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, c-format
 msgid "Failed to write file %s"
-msgstr "Datei %s konnte nicht geschrieben werden"
+msgstr "Datei %s konnte nicht geschrieben werden."
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
-msgstr "Datei %s konnte nicht geschlossen werden"
+msgstr "Datei %s konnte nicht geschlossen werden."
 
 #: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
 msgid "The path %s is too long"
-msgstr "Der Pfad %s ist zu lang"
+msgstr "Der Pfad %s ist zu lang."
 
 #: apt-inst/extract.cc:127
 #, c-format
@@ -2269,7 +2270,7 @@ msgstr "%s mehr als einmal entpackt"
 #: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "Das Verzeichnis %s ist umgeleitet"
+msgstr "Das Verzeichnis %s ist umgeleitet."
 
 #: apt-inst/extract.cc:147
 #, c-format
@@ -2278,47 +2279,47 @@ msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s"
 
 #: apt-inst/extract.cc:157 apt-inst/extract.cc:300
 msgid "The diversion path is too long"
-msgstr "Der Umleitungspfad ist zu lang"
+msgstr "Der Umleitungspfad ist zu lang."
 
 #: apt-inst/extract.cc:243
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
-msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt"
+msgstr "Das Verzeichnis %s wird durch ein Nicht-Verzeichnis ersetzt."
 
 #: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
-msgstr "Knoten konnte nicht in seinem Hash gefunden werden"
+msgstr "Knoten konnte nicht in seinem Hash gefunden werden."
 
 #: apt-inst/extract.cc:287
 msgid "The path is too long"
-msgstr "Der Pfad ist zu lang"
+msgstr "Der Pfad ist zu lang."
 
 #: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "Pakettreffer ohne Version für %s wird überschrieben"
+msgstr "Pakettreffer ohne Version für %s wird überschrieben."
 
 #: apt-inst/extract.cc:432
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben"
+msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben."
 
 #: apt-inst/extract.cc:492
 #, c-format
 msgid "Unable to stat %s"
-msgstr "»stat« konnte nicht auf %s ausgeführt werden"
+msgstr "%s mit »stat« abfragen nicht möglich"
 
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält"
+msgstr "Dies ist kein gültiges DEB-Archiv, da es »%s« nicht enthält."
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
-"Dies ist kein gültiges DEB-Archiv, da es weder »%s«, »%s« noch »%s« enthält"
+"Dies ist kein gültiges DEB-Archiv, da es weder »%s«, »%s« noch »%s« enthält."
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2331,12 +2332,12 @@ msgstr "Auswerten der »control«-Datei nicht möglich"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
-msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden"
+msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden."
 
 #: apt-pkg/contrib/mmap.cc:111
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden"
+msgstr "Datei-Deskriptor %i konnte nicht dupliziert werden."
 
 #: apt-pkg/contrib/mmap.cc:119
 #, c-format
@@ -2345,20 +2346,20 @@ msgstr "mmap mit %llu Byte Größe konnte nicht erzeugt werden."
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
-msgstr "mmap konnte nicht geschlossen werden"
+msgstr "mmap konnte nicht geschlossen werden."
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr "mmap konnte nicht synchronisiert werden"
+msgstr "mmap konnte nicht synchronisiert werden."
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden"
+msgstr "mmap mit %lu Byte Größe konnte nicht erzeugt werden."
 
 #: apt-pkg/contrib/mmap.cc:322
 msgid "Failed to truncate file"
-msgstr "Datei konnte nicht eingekürzt werden"
+msgstr "Datei konnte nicht eingekürzt werden."
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2484,18 +2485,18 @@ msgstr "%c%s... Fertig"
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kommandozeilenoption »%c« [aus %s] ist nicht bekannt."
+msgstr "Befehlszeilenoption »%c« [aus %s] ist nicht bekannt."
 
 #: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
 #: apt-pkg/contrib/cmndline.cc:122
 #, c-format
 msgid "Command line option %s is not understood"
-msgstr "Kommandozeilenoption %s konnte nicht ausgewertet werden"
+msgstr "Befehlszeilenoption %s konnte nicht ausgewertet werden."
 
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Kommandozeilenoption %s ist nicht Bool'sch"
+msgstr "Befehlszeilenoption %s ist nicht Bool'sch."
 
 #: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
 #, c-format
@@ -2510,12 +2511,12 @@ msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«."
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«"
+msgstr "Option %s erfordert ein Ganzzahl-Argument, nicht »%s«."
 
 #: apt-pkg/contrib/cmndline.cc:268
 #, c-format
 msgid "Option '%s' is too long"
-msgstr "Option »%s« ist zu lang"
+msgstr "Option »%s« ist zu lang."
 
 # Check for boolean; -1 is unspecified, 0 is yes 1 is no
 #: apt-pkg/contrib/cmndline.cc:300
@@ -2531,11 +2532,11 @@ msgstr "Ungültige Operation %s"
 #: apt-pkg/contrib/cdromutl.cc:56
 #, c-format
 msgid "Unable to stat the mount point %s"
-msgstr "»stat« konnte nicht auf den Einbindungspunkt %s ausgeführt werden"
+msgstr "Einbindungspunkt %s mit »stat« abfragen nicht möglich."
 
 #: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
-msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden"
+msgstr "CD-ROM mit »stat« abfragen fehlgeschlagen"
 
 #: apt-pkg/contrib/fileutl.cc:93
 #, c-format
@@ -2545,17 +2546,17 @@ msgstr "Problem beim Schließen der gzip-Datei %s"
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet"
+msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet."
 
 #: apt-pkg/contrib/fileutl.cc:230
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "Sperrdatei %s konnte nicht geöffnet werden"
+msgstr "Sperrdatei %s konnte nicht geöffnet werden."
 
 #: apt-pkg/contrib/fileutl.cc:248
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet"
+msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet."
 
 #: apt-pkg/contrib/fileutl.cc:252
 #, c-format
@@ -2611,17 +2612,17 @@ msgstr "Unterprozess %s unerwartet beendet"
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
 #, c-format
 msgid "Could not open file %s"
-msgstr "Datei %s konnte nicht geöffnet werden"
+msgstr "Datei %s konnte nicht geöffnet werden."
 
 #: apt-pkg/contrib/fileutl.cc:1066
 #, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden"
+msgstr "Datei-Deskriptor %d konnte nicht geöffnet werden."
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
 msgstr ""
-"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden"
+"Interprozesskommunikation mit Unterprozess konnte nicht aufgebaut werden."
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
@@ -2665,12 +2666,12 @@ msgstr "Leerer Paketzwischenspeicher"
 
 #: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
-msgstr "Die Paketzwischenspeicher-Datei ist beschädigt"
+msgstr "Die Paketzwischenspeicher-Datei ist beschädigt."
 
 #: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr ""
-"Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor"
+"Die Paketzwischenspeicher-Datei liegt in einer inkompatiblen Version vor."
 
 #: apt-pkg/pkgcache.cc:162
 msgid "The package cache file is corrupted, it is too small"
@@ -2679,11 +2680,11 @@ msgstr "Die Paketzwischenspeicher-Datei ist beschädigt, sie ist zu klein."
 #: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt"
+msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt."
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
-msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut"
+msgstr "Der Paketzwischenspeicher wurde für eine andere Architektur aufgebaut."
 
 #: apt-pkg/pkgcache.cc:305
 msgid "Depends"
@@ -2743,11 +2744,11 @@ msgstr "extra"
 
 #: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
-msgstr "Abhängigkeitsbaum wird aufgebaut"
+msgstr "Abhängigkeitsbaum wird aufgebaut."
 
 #: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
-msgstr "Mögliche Versionen"
+msgstr "Installationskandidat-Versionen"
 
 #: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
@@ -2755,27 +2756,27 @@ msgstr "Abhängigkeitsgenerierung"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
-msgstr "Statusinformationen werden eingelesen"
+msgstr "Statusinformationen werden eingelesen."
 
 #: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr "StateFile %s konnte nicht geöffnet werden"
+msgstr "StateFile %s konnte nicht geöffnet werden."
 
 #: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "Temporäres StateFile %s konnte nicht geschrieben werden"
+msgstr "Temporäres StateFile %s konnte nicht geschrieben werden."
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)."
 
 #: apt-pkg/tagfile.cc:216
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)"
+msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)."
 
 #: apt-pkg/sourcelist.cc:96
 #, c-format
@@ -2831,7 +2832,7 @@ msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)"
 #: apt-pkg/sourcelist.cc:248
 #, c-format
 msgid "Opening %s"
-msgstr "%s wird geöffnet"
+msgstr "%s wird geöffnet."
 
 #: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
 #, c-format
@@ -2846,7 +2847,7 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 #: apt-pkg/sourcelist.cc:289
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt"
+msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt."
 
 #: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2877,7 +2878,7 @@ msgstr ""
 #: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "Indexdateityp »%s« wird nicht unterstützt"
+msgstr "Indexdateityp »%s« wird nicht unterstützt."
 
 #: apt-pkg/algorithms.cc:261
 #, c-format
@@ -2922,7 +2923,7 @@ msgstr "Archivverzeichnis %spartial fehlt."
 #: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
-msgstr "Das Verzeichnis %s kann nicht gesperrt werden"
+msgstr "Das Verzeichnis %s kann nicht gesperrt werden."
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2944,7 +2945,7 @@ msgstr "Der Treiber für Methode %s konnte nicht gefunden werden."
 #: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "Methode %s ist nicht korrekt gestartet"
+msgstr "Methode %s ist nicht korrekt gestartet."
 
 #: apt-pkg/acquire-worker.cc:440
 #, c-format
@@ -2956,7 +2957,7 @@ msgstr ""
 #: apt-pkg/init.cc:152
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "Paketierungssystem »%s« wird nicht unterstützt"
+msgstr "Paketierungssystem »%s« wird nicht unterstützt."
 
 #: apt-pkg/init.cc:168
 msgid "Unable to determine a suitable packaging system type"
@@ -2965,13 +2966,13 @@ msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich"
 #: apt-pkg/clean.cc:57
 #, c-format
 msgid "Unable to stat %s."
-msgstr "»stat« kann nicht auf %s ausgeführt werden."
+msgstr "%s mit stat abfragen nicht möglich"
 
 #: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei "
-"eintragen"
+"eintragen."
 
 #: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
@@ -2981,7 +2982,7 @@ msgstr ""
 
 #: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
-msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren"
+msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren."
 
 #: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
@@ -3005,7 +3006,7 @@ msgstr ""
 #: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "Pinning-Typ %s kann nicht interpretiert werden"
+msgstr "Pinning-Typ %s kann nicht interpretiert werden."
 
 #: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
@@ -3013,7 +3014,7 @@ msgstr "Keine Priorität (oder Null) für Pin angegeben"
 
 #: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
-msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem"
+msgstr "Zwischenspeicher hat ein inkompatibles Versionssystem."
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
@@ -3057,12 +3058,12 @@ msgstr ""
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
-"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden"
+"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden."
 
 #: apt-pkg/pkgcachegen.cc:1092
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden"
+msgstr "Die Quellpaket-Liste %s konnte nicht mit »stat« abgefragt werden"
 
 #: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
 #: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
@@ -3075,7 +3076,7 @@ msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien"
 
 #: apt-pkg/pkgcachegen.cc:1389 apt-pkg/pkgcachegen.cc:1396
 msgid "IO Error saving source cache"
-msgstr "E/A-Fehler beim Speichern des Quell-Caches"
+msgstr "E/A-Fehler beim Speichern des Quell-Zwischenspeichers"
 
 #: apt-pkg/acquire-item.cc:139
 #, c-format
@@ -3147,7 +3148,8 @@ msgid ""
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
-"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)"
+"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
+"Architektur)."
 
 #: apt-pkg/acquire-item.cc:1705
 #, c-format
@@ -3172,7 +3174,7 @@ msgstr "Größe stimmt nicht überein"
 #: apt-pkg/indexrecords.cc:64
 #, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Release-Datei %s kann nicht verarbeitet werden"
+msgstr "Release-Datei %s kann nicht verarbeitet werden."
 
 #: apt-pkg/indexrecords.cc:74
 #, c-format
@@ -3197,7 +3199,7 @@ msgstr "Ungültiger »Date«-Eintrag in Release-Datei %s"
 #: apt-pkg/vendorlist.cc:78
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "Herstellerblock %s enthält keinen Fingerabdruck"
+msgstr "Herstellerblock %s enthält keinen Fingerabdruck."
 
 #: apt-pkg/cdrom.cc:576
 #, c-format
@@ -3206,7 +3208,7 @@ msgid ""
 "Mounting CD-ROM\n"
 msgstr ""
 "Verwendeter CD-ROM-Einbindungspunkt: %s\n"
-"CD-ROM wird eingebunden\n"
+"CD-ROM wird eingebunden.\n"
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
@@ -3330,34 +3332,34 @@ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
 #: apt-pkg/indexcopy.cc:692
 #, c-format
 msgid "No keyring installed in %s."
-msgstr "Kein Schlüsselring in %s installiert."
+msgstr "Kein Schlüsselring in %s installiert"
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden"
+msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden."
 
 #: apt-pkg/cacheset.cc:406
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
+msgstr "Version »%s« für »%s« konnte nicht gefunden werden."
 
 #: apt-pkg/cacheset.cc:517
 #, c-format
 msgid "Couldn't find task '%s'"
-msgstr "Task »%s« konnte nicht gefunden werden"
+msgstr "Task »%s« konnte nicht gefunden werden."
 
 #: apt-pkg/cacheset.cc:523
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden"
+msgstr "Mittels regulärem Ausdruck »%s« konnte kein Paket gefunden werden."
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Es können keine Versionen von Paket »%s« ausgewählt werden, da es rein "
-"virtuell ist"
+"virtuell ist."
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3366,28 +3368,28 @@ msgid ""
 "neither of them"
 msgstr ""
 "Es kann weder eine installierte Version noch ein Installationskandidat von "
-"Paket »%s« ausgewählt werden, da beide nicht existieren"
+"Paket »%s« ausgewählt werden, da beide nicht existieren."
 
 #: apt-pkg/cacheset.cc:555
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Die neueste Version von Paket »%s« kann nicht ausgewählt werden, da es rein "
-"virtuell ist"
+"virtuell ist."
 
 #: apt-pkg/cacheset.cc:563
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Es kann kein Installationskandidat von Paket »%s« ausgewählt werden, da kein "
-"solcher existiert"
+"solcher existiert."
 
 #: apt-pkg/cacheset.cc:571
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 "Die installierte Version von Paket »%s« kann nicht ausgewählt werden, da es "
-"nicht installiert ist"
+"nicht installiert ist."
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
@@ -3413,22 +3415,22 @@ msgstr "Externen Problemlöser ausführen"
 #: apt-pkg/deb/dpkgpm.cc:72
 #, c-format
 msgid "Installing %s"
-msgstr "%s wird installiert"
+msgstr "%s wird installiert."
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Configuring %s"
-msgstr "%s wird konfiguriert"
+msgstr "%s wird konfiguriert."
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Removing %s"
-msgstr "%s wird entfernt"
+msgstr "%s wird entfernt."
 
 #: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Completely removing %s"
-msgstr "%s wird vollständig entfernt"
+msgstr "%s wird vollständig entfernt."
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3449,22 +3451,22 @@ msgstr "Verzeichnis »%s« fehlt"
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
 #, c-format
 msgid "Could not open file '%s'"
-msgstr "Datei »%s« konnte nicht geöffnet werden"
+msgstr "Datei »%s« konnte nicht geöffnet werden."
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
 msgid "Preparing %s"
-msgstr "%s wird vorbereitet"
+msgstr "%s wird vorbereitet."
 
 #: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Unpacking %s"
-msgstr "%s wird entpackt"
+msgstr "%s wird entpackt."
 
 #: apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "Konfiguration von %s wird vorbereitet"
+msgstr "Konfiguration von %s wird vorbereitet."
 
 #: apt-pkg/deb/dpkgpm.cc:952
 #, c-format
@@ -3474,7 +3476,7 @@ msgstr "%s installiert"
 #: apt-pkg/deb/dpkgpm.cc:957
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr "Entfernen von %s wird vorbereitet"
+msgstr "Entfernen von %s wird vorbereitet."
 
 #: apt-pkg/deb/dpkgpm.cc:959
 #, c-format
@@ -3484,7 +3486,7 @@ msgstr "%s entfernt"
 #: apt-pkg/deb/dpkgpm.cc:964
 #, c-format
 msgid "Preparing to completely remove %s"
-msgstr "Vollständiges Entfernen von %s wird vorbereitet"
+msgstr "Vollständiges Entfernen von %s wird vorbereitet."
 
 #: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
@@ -3509,7 +3511,7 @@ msgstr "Operation wurde unterbrochen, bevor sie beendet werden konnte."
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da das Limit MaxReports bereits "
-"erreicht ist"
+"erreicht ist."
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1477
@@ -3530,7 +3532,7 @@ msgid ""
 "error"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen voller Festplatte hindeutet"
+"wegen voller Festplatte hindeutet."
 
 #: apt-pkg/deb/dpkgpm.cc:1492
 msgid ""
@@ -3538,7 +3540,7 @@ msgid ""
 "error"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Fehler "
-"wegen erschöpftem Arbeitsspeicher hindeutet"
+"wegen erschöpftem Arbeitsspeicher hindeutet."
 
 #: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
 msgid ""
@@ -3553,7 +3555,7 @@ msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 "Es wurde kein Apport-Bericht verfasst, da die Fehlermeldung auf einen Ein-/"
-"Ausgabe-Fehler von Dpkg hindeutet"
+"Ausgabe-Fehler von Dpkg hindeutet."
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
@@ -3578,74 +3580,32 @@ msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "Der dpkg-Prozess wurde unterbrochen; Sie müssen manuell »%s« ausführen, um "
-"das Problem zu beheben. "
+"das Problem zu beheben."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Lesefehler von Prozess %s"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Interner Fehler beim Hinzufügen einer Umleitung"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Ungültige Zeile in der Umleitungsdatei: %s"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Die Umleitungsdatei ist beschädigt"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Fehler beim Öffnen der Umleitungsdatei %sdiversions"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "Interner Fehler beim Holen eines Knotens"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Offset %lu"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Fehler beim Verarbeiten der MD5-Summe. Offset %lu"
-
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Nicht vorhandene Datei %s wird übersprungen."
 
 #~ msgid "Failed to remove %s"
-#~ msgstr "%s konnte nicht entfernt werden"
+#~ msgstr "%s konnte nicht entfernt werden."
 
 #~ msgid "Unable to create %s"
-#~ msgstr "%s konnte nicht erzeugt werden"
+#~ msgstr "%s konnte nicht erzeugt werden."
 
 #~ msgid "Failed to stat %sinfo"
-#~ msgstr "»stat« konnte nicht auf %sinfo ausgeführt werden"
+#~ msgstr "%sinfo mit »stat« abfragen fehlgeschlagen"
 
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr ""
 #~ "Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem "
-#~ "liegen"
+#~ "liegen."
 
 #~ msgid "Failed to change to the admin dir %sinfo"
 #~ msgstr "Wechsel in das Administrationsverzeichnis %sinfo fehlgeschlagen"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Es konnte keine »Package:«-Kopfzeile gefunden werden, Offset %lu"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Wechsel nach %s nicht möglich"
-
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Es konnte keine gültige »control«-Datei gefunden werden"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden"
-
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Einzelne Kopfzeile aus %u Zeichen erhalten"
-
 #~ msgid "Internal error getting a package name"
 #~ msgstr "Interner Fehler beim Holen eines Paketnamens"
 
@@ -3664,92 +3624,116 @@ msgstr "Nicht gesperrt"
 #~ msgid "Failed reading the list file %sinfo/%s"
 #~ msgstr "Fehler beim Lesen der Listendatei %sinfo/%s"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Nicht genügend Platz für »Dynamic MMap«. Bitte erhöhen Sie den Wert von "
-#~ "APT::Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Interner Fehler beim Holen eines Knotens"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Nicht vorhandene Datei %s wird übersprungen"
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Fehler beim Öffnen der Umleitungsdatei %sdiversions"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Die Umleitungsdatei ist beschädigt."
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Ungültige Zeile in der Umleitungsdatei: %s"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Interner Fehler beim Hinzufügen einer Umleitung"
+
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Der Paketzwischenspeicher muss zuerst initialisiert werden."
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Es konnte keine »Package:«-Kopfzeile gefunden werden, Offset %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Fehlerhafter »ConfFile«-Abschnitt in der Statusdatei, Offset %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Fehler beim Verarbeiten der MD5-Summe. Offset %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Wechsel nach %s nicht möglich"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Es konnte keine gültige »control«-Datei gefunden werden."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Pipe (Weiterleitung) für %s konnte nicht geöffnet werden."
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Lesefehler von Prozess %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Einzelne Kopfzeile aus %u Zeichen erhalten"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr ""
 #~ "Hinweis: Dies wird automatisch und absichtlich von dpkg durchgeführt."
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Der Paketzwischenspeicher muss zuerst initialisiert werden"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Missgestaltetes Override %s Zeile %lu #1"
 
-#~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Missgestaltetes Override %s Zeile %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Missgestaltetes Override %s Zeile %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "Dekomprimierer"
+
+#~ msgid "read, still have %lu to read but none left"
 #~ msgstr ""
-#~ "Aufruf: apt-mark [Optionen] {auto|manual} paket1 [paket2 ...]\n"
-#~ "\n"
-#~ "apt-mark ist ein einfaches Befehlszeilenprogramm, um Pakete als manuell\n"
-#~ "oder automatisch installiert zu markieren. Diese Markierungen können "
-#~ "auch\n"
-#~ "aufgelistet werden.\n"
-#~ "\n"
-#~ "Befehle:\n"
-#~ "   auto   – das angegebene Paket als »Automatisch installiert« markieren\n"
-#~ "   manual – das angegebene Paket als »Manuell installiert« markieren\n"
-#~ "\n"
-#~ "Optionen:\n"
-#~ "  -h   dieser Hilfetext\n"
-#~ "  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-#~ "  -qq  keine Ausgabe, außer bei Fehlern\n"
-#~ "  -s   nichts tun, nur eine Simulation der Aktionen durchführen\n"
-#~ "  -f   Autom./Manuell-Markierung in der angegebenen Datei lesen/"
-#~ "schreiben\n"
-#~ "  -c=? Diese Konfigurationsdatei benutzen\n"
-#~ "  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#~ "Siehe auch die Handbuchseiten apt-mark(8) und apt.conf(5) bezüglich\n"
-#~ "weitergehender Informationen und Optionen."
+#~ "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr ""
+#~ "Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben "
+#~ "nicht möglich"
 
 #~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Aufruf: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver ist eine Schnittstelle, um den derzeitigen "
-#~ "internen\n"
-#~ "Problemlöser für die APT-Familie wie einen externen zu verwenden, zwecks\n"
-#~ "Fehlersuche oder ähnlichem.\n"
-#~ "\n"
-#~ "Optionen:\n"
-#~ "  -h   dieser Hilfetext\n"
-#~ "  -q   protokollierbare Ausgabe – keine Fortschrittsanzeige\n"
-#~ "  -c=? Diese Konfigurationsdatei benutzen\n"
-#~ "  -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n"
-#~ "Siehe auch die Handbuchseite apt.conf(5) bezüglich weitergehender\n"
-#~ "Informationen und Optionen.\n"
-#~ "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
+#~ "»%s« (bereits entpackt) konnte nicht unmittelbar konfiguriert werden. "
+#~ "Lesen Sie »man 5 apt.conf« unter APT::Immediate-Configure bezüglich "
+#~ "weiterer Details."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Fehler aufgetreten beim Verarbeiten von %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Interner Fehler, Bestandteil konnte nicht gefunden werden"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Interner Fehler, Gruppe »%s« hat kein installierbares Pseudo-Paket"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release-Datei abgelaufen, %s wird ignoriert (ungültig seit %s)"
diff --git a/po/dz.po b/po/dz.po
index 9f99c8458..311630785 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,18 +7,16 @@ msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:14+0000\n"
-"Last-Translator: kinley tshering <Unknown>\n"
+"PO-Revision-Date: 2006-09-19 09:49+0530\n"
+"Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
 "Language: dz\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-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
-"X-Poedit-Country: Bhutan\n"
+"Plural-Forms: nplurals=2;plural=(n!=1)\n"
 "X-Poedit-Language: Dzongkha\n"
+"X-Poedit-Country: Bhutan\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: cmdline/apt-cache.cc:158
@@ -28,71 +26,74 @@ msgstr "ཐུམ་སྒྲིལ་ %s ཐོན་རིམ་ %s ལུ་
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ: "
+msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "ཐུམ་སྒྲིལ་བསྡོམས་ཀྱི་མིང་ཚུ:"
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ། "
+msgstr "སྤྱིར་བཏང་ཐུམ་སྒྲིལ་ཚུ།"
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ: "
+msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་གཙང་མ་ཚུ:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ: "
+msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་རྐྱང་པ་ཚུ:"
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ: "
+msgstr "བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་སླ་བསྲེ་ཡོད་མི་ཚུ:"
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  བརླག་སྟོར་ཞུགས་པ: "
+msgstr "བརླག་སྟོར་ཞུགས་པ:"
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས: "
+msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "ཁྱད་རྟགས་ཅན་གྱི་ཐོན་རིམ་ཚུ་གི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "རྟེན་འབྲེལ་བསྡོམས: "
+msgstr "རྟེན་འབྲེལ་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས: "
+msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "ཐེན་རིམ་/ཡིག་སྣོད་ མཐུན་འབྲེལ་གྱི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན: "
+msgstr "ཡོངས་བསྡོམས་ཀྱིས་ས་ཁྲ་བཟོ་བ་ཚུ་བྱིནམ་ཨིན:"
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས: "
+msgstr "སྤུངས་ཡོད་པའི་ཡིག་རྒྱུན་གྱི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས: "
+msgstr "རྟེན་འབྲེལ་ཐོན་རིམ་བར་སྟོང་གྱི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས: "
+msgstr "བར་སྟོང་ལྷུག་ལྷུག་གི་བསྡོམས:"
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང: "
+msgstr "གི་དོན་ལུ་རྩིས་ཐོ་བཏོན་ཡོད་པའི་བར་སྟོང:"
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -106,8 +107,9 @@ msgid "No packages found"
 msgstr "ཐུམ་སྒྲིལ་ཚུ་མ་ཐོབ།"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "ཁྱོད་ཀྱིས་ཏག་ཏག་སྦེ་དཔེ་གཞི་གཅིག་བྱིན་དགོ"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -138,11 +140,11 @@ msgstr "(མ་ཐོབ།)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  གཞི་བཙུགས་འབད་ཡོདཔ། "
+msgstr "གཞི་བཙུགས་འབད་ཡོདཔ།"
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  མི་ངོ: "
+msgstr "མི་ངོ:"
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -150,22 +152,23 @@ msgstr "(ཅི་མེད།)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར: "
+msgstr "ཐུམ་སྒྲིལ་གྱི་ཁབ་གཟེར:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
-msgstr "  ཐོན་རིམ་ཐིག་ཁྲམ།:"
+msgstr "ཐོན་རིམ་ཐིག་ཁྲམ།:"
 
 #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,19 +204,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 ""
+"ལག་ལེན།: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
+"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"  apt-cacheའདི་གནས་རིམ་དམའ་དྲག་གི་ལག་ཆས་ APT's binary\n"
+"་ འདྲ་མཛོད་ཡིག་སྣོད་གཡོག་བཀོལ་དོན་ལུ་ལག་ལེན་འཐབ་ནི་དང་་དེ་ཚུ་ནང་ལས་བརྡ་དོན་འདྲི་དཔྱད་འབད་ནིའི་དོན་"
+"ལུ་ཨིན།\n"
+"cache files, and query information from them\n"
+"\n"
+"བརྡ་བཀོད:\n"
+"    add -འདི་གིས་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ཅིག་འབྱུང་ཁུངས་འདྲ་མཛོད་ལུ་ཁ་སྐོང་རྐྱབས་ཨིན།\n"
+"    gencaches -འདི་གིས་ཐུམ་སྒྲིལ་དང་འབྱུང་ཁུངས་འདྲ་མཛོད་གཉིས་ཆ་རང་བཟོ་བརྩིགས་འབདཝ་ཨིན།\n"
+"    showpkg -འད་གིས་་ཐུམ་སྒྲིལ་རྐྱང་པ་ཅིག་གི་དོན་ལུ་སྤྱིར་བཏང་བརྡ་དོན་དུམ་གྲ་ཅིག་སྟོནམ་ཨིན།\n"
+"    showsrc - འདི་གིས་འབྱུང་ཁུངས་ཀྱི་དྲན་ཐོ་ཚུ་སྟོནམ་ཨིན།\n"
+"   stats -འདི་གིས་ གཞི་རིམ་ཚད་རྩིས་དུམ་གྲ་རེ་སྟོནམ་ཨིན།\n"
+"    dump -འདི་གི་ཡིག་སྣོད་ཧྲིལ་བུ་མདོར་བསྡུས་རྣམཔ་་ཅིག་ནང་སྟོནམ་ཨིན།\n"
+"   dumpavail -འདི་གིས་ཨེསི་ཊི་ཌི་ཕྱི་ཁར་ལུ་ འཐོབ་ཚུགས་པའི་ཡིག་སྣོད་ཚུ་དཔར་བསྐྲུན་འབདཝ་ཨིན།\n"
+"   unmet - འདི་གིས་མ་ཚང་བའི་ རྟེན་འབྲེལ་ཚུ་སྟོནམ་ཨིན།\n"
+"   search -འདི་གིས་ རི་ཇེགསི་དཔེ་གཞི་ཅིག་གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཐོ་ཡིག་དེ་འཚོལ་ཞིབ་འབདཝ་ཨིན།\n"
+"   show - འདི་གིས་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ ལྷག་བཏུབ་པའི་དྲན་ཐོ་ཅིག་སྟོནམ་ཨིན།\n"
+"   depends - འདི་གིས་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ རགས་པ་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་ཅིག་ སྟོནམ་ཨིན།\n"
+"   rdepends - འདི་གིས་ ཐུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ རིམ་ལོག་རྟེན་འབྲེལ་གྱི་བརྡ་དོན་དེ་སྟོནམ་ཨིན།\n"
+"   pkgnames - འདི་གིས་ཐུམ་སྒྲིལ་ཚུ་ཆ་མཉམ་གི་མིང་ཚུ་ཐོ་བཀོད་འབདཝ་ཨིན།\n"
+"   dotty - འདི་གིས་ཚད་ཁྲམ་ཝིསི་གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཚད་ཁྲམ་ཚུ་ བཟོ་བཏོན་འབདཝ་ཨིན།\n"
+"   xvcg - འདི་གིས་ ཨེགསི་ཝི་སི་ཇི་ གི་དོན་ལུ་ ཐུམ་སྒྲིལ་ཚད་ཁྲམ་ཚུ་བཟོ་བཏོད་འབདཝ་ཨིན།\n"
+"   policy - འདི་གིས་ སྲིད་བྱུས་སྒྲིག་སྟངས་ཚུ་སྟོནམ་ཨིན།\n"
+"\n"
+"གདམ་ཁ་ཚུ་:\n"
+"  -h   འདི་གིས་ཚིག་ཡིག་ལུ་ཆ་རོགས་འབདཝ་ཨིན།.\n"
+"  -p=? འདི་འབྱུང་ཁུངས་འའདྲ་མཛོད་ཨིན།.\n"
+"  -s=? འདི་འབྱུང་ཁུངས་འདྲ་མཛོད་ཨིན།.\n"
+"  -q   འདི་གིས་ ཡར་འཕེལ་བརྡ་སྟོན་པ་འདི་ལྕོགས་མིན་བཟོཝ་ཨིན།.\n"
+"  -i  འདི་གིས་ མ་ཚང་པའི་བརྡ་བཀོད་ཚུ་གི་དོན་ལུ་ གལ་ཅན་གྱི་ཌེཔསི་རྐྱངམ་ཅིག་སྟོན།.\n"
+"  -c=? འདི་གིས་ འ་ནི་རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།.\n"
+"  -o=? འདི་གིས་ མཐུན་སྒྲིག་རིམ་སྒྲིག་གི་གདམ་ཁ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་ eg -o dir::"
+"cache=/tmp\n"
+" ཧེང་བཀལ་བརྡ་དོན་གི་དོན་ལུ་ ཨེ་apt-cache(8)དང་apt.conf(5)ལག་ཐོག་ཤོག་ལེབ་ཚུ་བལྟ།.\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "ཌིསིཀ་འདི་གི་དོན་ལུ་མིང་ཅིག་བླིན་གནང་  དཔེར་ན་ 'Debian 2.1r1 Disk 1'བཟུམ།"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "ཌིསིཀ་ཅིག་འདྲེན་འཕྲུལ་ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -296,7 +337,7 @@ msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས
 
 #: cmdline/apt-get.cc:369
 msgid " or"
-msgstr " ཡང་ན།"
+msgstr "ཡང་ན།"
 
 #: cmdline/apt-get.cc:398
 msgid "The following NEW packages will be installed:"
@@ -325,7 +366,7 @@ msgstr "འོག་གི་འཆང་ཡོད་པའི་ཐུམ་ས
 #: cmdline/apt-get.cc:563
 #, c-format
 msgid "%s (due to %s) "
-msgstr "%s( %s་གིས་སྦེ) "
+msgstr "%s( %s་གིས་སྦེ)"
 
 #: cmdline/apt-get.cc:571
 msgid ""
@@ -338,17 +379,17 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད། "
+msgstr "%lu་ཡར་བསྐྱེད་འབད་ཡོད་ %lu་འདི་གསརཔ་སྦེ་གཞི་བཙུགས་འབད་ཡོད།"
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད། "
+msgstr "%lu་འདི་ལོག་གཞི་བཙུགས་འབད་ཡོད།"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད། "
+msgstr "%lu་འདི་མར་ཕབ་འབད་ཡོད།"
 
 #: cmdline/apt-get.cc:610
 #, c-format
@@ -361,14 +402,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu་འདི་ཆ་ཚང་སྦེ་གཞི་བཙུགས་མ་འབད་ཡང་ན་རྩ་བསྐྲད་མ་གཏང་པས།\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -380,8 +421,9 @@ msgid " [Installed]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "མི་ངོ་འཐོན་རིམཚུ།"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -403,9 +445,9 @@ msgid "However the following packages replace it:"
 msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -414,19 +456,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -436,9 +478,11 @@ msgstr ""
 "འབད་བས།\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
+"འབད་བས།\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -451,19 +495,19 @@ msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -471,7 +515,7 @@ msgstr "རྟེན་འབྲེལ་ནོར་བཅོས་འབད་
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
-msgstr " འཐུས་ཤོར་བྱུང་ཡོད།"
+msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
@@ -483,7 +527,7 @@ msgstr "ཡར་བསྐྱེད་འབད་ཡོད་པའི་ཆ་
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
-msgstr " འབད་ཚར་ཡི།"
+msgstr "འབད་ཚར་ཡི།"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
@@ -550,16 +594,16 @@ msgstr "ཡིག་མཛོད་ཀྱི་%sB་འདི་ལེན་ད
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི་ཤུལ་ལས་ཌིཀསི་གི་བར་སྟོང་དེ་ལག་ལེན་འཐབ་འོང་།\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
@@ -597,7 +641,7 @@ msgstr "བར་བཤོལ་འབད།"
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]? "
+msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -652,9 +696,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -691,25 +735,27 @@ msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
+msgstr[1] "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -766,9 +812,9 @@ msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -838,7 +884,7 @@ msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་
 #: cmdline/apt-get.cc:2603
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "%s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
+msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -909,11 +955,11 @@ msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -930,18 +976,20 @@ msgstr ""
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
+"ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -951,22 +999,23 @@ msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲ�
 #: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
+msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
 #: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "%s (%s)་ལུ་མཐུད་དོ།"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1011,6 +1060,48 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"ལག་ལེན་:apt-get [options] command\n"
+"apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get འདི་ཐུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་དང་\n"
+"གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་  འཇམ་སམ་བརྡ་བཀོད་གྲལ་ཐིག་གི་ངོས་འདྲ་བ་ཅིག་ཨིན།  མང་ཤོས་རང་་སྦེ་རང་"
+"ལག་ལེན་འཐབ་ཡོད་པའི་བརྡ་བཀོད་ཚུ་\n"
+" དུས་མཐུན་དང་གཞི་བཙུགས་འབད་ནི་དེ་ཨིན།\n"
+"\n"
+"བརྡ་བཀོད་ཚུ་:\n"
+"   update - འདི་གིས་ཐུམ་སྒྲིལ་ཚུ་གི་ཐོ་ཡིག་གསརཔ་ཚུ་སླར་འདྲེན་འབདཝ་ཨིན།\n"
+"   upgrade - འདི་གིས་ ཡར་བསྐྱེད་ཀྱི་ལཱ་འགན་ཅིག་འགྲུབ་ཨིན།\n"
+"   install - འདི་གིས་ ཐུམ་སྒྲིལ་(pkg is libc6 not libc6.deb)གསརཔ་་ཚུ་གཞི་བཙུགས་འབདཝ་"
+"ཨིན།\n"
+"   remove -འདི་གིས་ ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་གཏངམ་ཨིན།\n"
+"   source - འདི་གིས་འབྱུང་ཁུངས་ཀྱི་ཡིག་མཛོད་ཚུ་ཕབ་ལེན་འབདཝ་ཨིན།\n"
+"   build-dep - འདི་གིས་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་ཚུ་རིམ་སྒྲིག་འབདཝ་"
+"ཨིན།\n"
+"   dist-upgrade - འདི་གིས་ བགོ་བཀྲམ་འདི་ཡར་བསྐྱེད་འབདཝ་ཨིན། apt-get(8)ལུ་བལྟ།\n"
+"   dselect-upgrade - འདི་གིས་ སེལ་འཐུ་བཤོལ་གྱི་ སེལ་འཐུ་ཚུ་འབདཝ་ཨིན།\n"
+"   clean - འདི་གིས་ ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་མཛོད་ཀྱི་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏངམ་ཨིན།\n"
+"   autoclean -འདི་གིས་ ཕབ་ལེན་འབད་འབདཝ་རྙིངམ་གྱི་ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་ཀྲེག་གཏངམ་ཨིན།\n"
+"   check - ཆད་པ་འགྱོ་འགྱོ་བའི་རྟེན་འབྲེལ་ཚུ་མེདཔ་སྦེ་བདེན་སྦྱོར་འབདཝ་ཨིན།\n"
+"\n"
+"གདམ་ཁ་ཚུ་:\n"
+"  -h  འདི་གིས་ཚིག་ཡིག་ལུ་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -q  དྲན་དེབ་འབད་བཏུབ་པའི་ཨའུཊི་པུཊི་ -ཡར་འཕེལ་གྱི་བརྡ་སྟོན་མིན་འདུག\n"
+"  -qq འཛོལ་བ་ཚུ་གི་དོན་ལུ་རྐྱངམ་ཅིག་མ་གཏོགས་ཨའུཊི་པུཊི་མིན་འདུག\n"
+"  -d  ཕབ་ལེན་རྐྱངམ་ཅིག་ཨིན་-  གཞི་བཙུགས་ཡང་ན་ཡིག་མཛོད་ཚུ་སྦུང་ཚན་བཟོ་བཤོལ་མ་འབད།\n"
+"  -s  བྱ་བ་མིན་འདུག   གོ་རིམ་མཚུངས་བཟོ་གི་ལས་འགན་འགྲུབ།\n"
+"  -y  འདྲི་དཔྱད་གེ་རང་ལུ་ཨིནམ་སྦེ་ཚོད་དཔག་བཞིནམ་ལས་ནུས་སྤེལ་མ་འབད།\n"
+"  -f ཆིག་སྒྲིལ་ཞིབ་དཔྱད་འདི་འཐུས་ཤོར་བྱུང་པ་ཅིན་ འཕྲོ་མཐུད་འབད་ནི་ལུ་དཔའ་བཅམ།\n"
+"  -m  ཡིག་མཛོད་འདི་ཚུ་ག་ཡོད་འཚོལ་མ་ཐོབ་པ་ཅིན་འཕྲོ་མཐུད་ནི་ལུ་དཔའ་བཅམ།\n"
+"  -u  ཡར་བསྐྱེད་བཟོ་ཡོད་པའི་ཐུམ་སྒྲིལ་འདི་ཡང་་སྟོན།\n"
+"  -b  འདི་ལེན་ཚར་བའི་ཤུལ་ལས འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་འདི་བཟོ་བརྩིགས་འབད།\n"
+" -V  བརྡ་དོན་ལེ་ཤཱ་གི་འཐོན་རིམ་ཨང་གྲངས་ཚུ་སྟོན།\n"
+"  -c=? འ་ནི་རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ལྷག\n"
+"  -o=? མཐུན་སྒྲིག་གདམ་ཁ་གི་རིམ་སྒྲིག་ཅིག་གཞི་བཙུགས་འབད་  དཔེན་ན་-o dir::cache=/tmp\n"
+"བརྡ་དོན་དང་གདམ་ཁ་ཚུ་ཧེང་བཀལ་གི་དོན་ལུ་ apt-get(8)་  sources.list(5) དང་apt.conf(5)"
+"ལག་ཐོག་\n"
+"ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
+"                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1022,7 +1113,7 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "ཨེབ། "
+msgstr "ཨེབ།"
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
@@ -1030,11 +1121,11 @@ msgstr "ལེན:"
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "ཨེལ་ཇི་ཨེན: "
+msgstr "ཨེལ་ཇི་ཨེན:"
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "ཨི་ཨར་ཨར། "
+msgstr "ཨི་ཨར་ཨར།"
 
 #: cmdline/acqprogress.cc:140
 #, c-format
@@ -1058,29 +1149,29 @@ msgstr ""
 "འདྲེན་འཕྲུལ་'%s'ནང་བཙུགས་བཞིནམ་ལས་ལོག་ལྡེ་འདི་ཨེབ།\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "འདི་འབདཝ་ད་འདི་གཞི་བཙུགས་མ་འབད་བས།"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1089,14 +1180,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1316,7 +1407,7 @@ msgstr "འདྲི་དཔྱད།"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "ལས་བཀོལ་འབད་མ་ཚུགས། "
+msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1341,12 +1432,12 @@ msgstr "%s:%s (%s)ལུ་མཐུད་ལམ་དེ་འགོ་འབ�
 #: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "%s:%s (%s)ལུ་མཐུད་མ་ཚུགས་  མཐུད་ལམ་ངལ་མཚམས།"
+msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས་  མཐུད་ལམ་ངལ་མཚམས།"
 
 #: methods/connect.cc:125
 #, 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
@@ -1366,14 +1457,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1387,8 +1478,10 @@ msgid "At least one invalid signature was encountered."
 msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།"
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
+"མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1506,9 +1599,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1551,12 +1644,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "སྦུང་ཚན་བཟོ་བཤོལ་འབད་བའི་བར་ན་ འཛོལ་བ་དག་པ་ཅིག་བྱུང་ནུག་ ང་གི་"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་རིམ་སྒྲིག་འབད་ནི་ཨིན།་འ་ནི་འདི་གིས་ ངོ་བཤུས་རྫུན་མ་"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1607,7 +1702,7 @@ msgstr ""
 #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1281
 #, c-format
 msgid "Unable to write to %s"
-msgstr "%sལུ་འབྲི་མ་ཚུགས།"
+msgstr " %sལུ་འབྲི་མ་ཚུགས།"
 
 #: cmdline/apt-extracttemplates.cc:313
 msgid "Cannot get debconf version. Is debconf installed?"
@@ -1741,10 +1836,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་  %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
+"ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས།  ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་  ཡར་བསྐྱེད་འབད་ཡོད་"
+"པ་ཅིན་  རྩ་བསྐྲད་གཏང་ཞིནམ་ལས་  གནད་སྡུད་གཞི་རྟེན་འདི་ ལོག་དེ་གསར་བསྐྲུན་འབད། "
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1777,15 +1875,15 @@ msgstr "ཌབ་ལུ་ %s སིཊེཊི་འབད་མ་ཚུག�
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "ཨི: "
+msgstr "ཨི:"
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "ཌབ་ལུ: "
+msgstr "ཌབ་ལུ:"
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད། "
+msgstr "ཨི:འཛོལ་བ་ཚུ་ཡིག་སྣོད་ལུ་འཇུག་སྤྱོད་འབད།"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
@@ -1824,7 +1922,7 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད�
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " %sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
+msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -1860,19 +1958,19 @@ msgid "Unable to open %s"
 msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1882,7 +1980,7 @@ msgstr "ཟུར་བཞག་ཡིག་སྣོད་%sའདི་ལྷ�
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
+msgstr " མ་ཤེས་ཨེབ་བཙུགས་ཨཱལ་གོ་རི་དམ'%s'"
 
 #: ftparchive/multicompress.cc:100
 #, c-format
@@ -1925,6 +2023,7 @@ msgid "Failed to rename %s to %s"
 msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1937,6 +2036,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"ལག་ལེན་: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates འདི་ཌེ་བི་ཡཱན་ ཐུམ་སྒྲིལ་ཚུ་ནང་ལས་\n"
+"རིམ་སྒྲིག་དང་ ཊེམ་པེལེཊི་ བརྡ་དོན་ཕྱིར་དོན་འབད་ནིའི་ལག་ཆས་ཅིགཨིན།\n"
+"གདམ་ཁ་ཚུ།\n"
+"  -h   འདི་གིས་ཚིག་ཡིག་འདི་གྲོགས་རམ་འབདཝ་ཨིན།\n"
+"  -t   འདི་གིས་temp་སྣོད་ཐོ་འདི་གཞི་སྒྲིག་འབདཝ་ཨིན།\n"
+"  -c=? འདི་གིས་ རིམ་སྒྲིག་ཡིག་སྣོད་འདི་ལྷགཔ་ཨིན།\n"
+"  -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་  དཔེར་ན་-o dir::cache=/tmp་"
+"བཟུམ།\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1974,7 +2083,7 @@ msgstr "རྒྱུད་དུང་ཚུ་གསར་བསྐྲུན་
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། "
+msgstr "ཇི་ཛིཔ་འདི་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -1998,9 +2107,9 @@ msgid "Error reading archive member header"
 msgstr "ཡིག་མཛོད་འཐུས་མི་མགོ་ཡིག་ལྷག་ནིའི་འཛོལ་བ།"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "ནུས་མེད་ཡིག་མཛོད་འཐུས་མི་གི་མགོ་ཡིག་"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2114,9 +2223,9 @@ msgstr "འ་ནི་འདི་ ཌི་ཨི་བི་ཡིག་མ�
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
+msgstr "འ་ནི་འདི་ཌི་ཨི་བི་ཡིག་མཛོད་ནུས་ཅན་ཅིག་མེན་པས་  འདི་ལུ་'%s'ཡང་ན་'%s'འཐུས་མི་མིན་འདུག"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2132,22 +2241,24 @@ msgid "Can't mmap an empty file"
 msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "%s་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "ལས་བཀོལ་འབད་མ་ཚུགས།"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2155,8 +2266,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2252,9 +2364,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2327,9 +2439,9 @@ msgid "Failed to stat the cdrom"
 msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2379,9 +2491,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2399,9 +2511,9 @@ msgid "Could not open file %s"
 msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2409,32 +2521,32 @@ msgstr "ཡན་ལག་ལས་སྦྱོར་ ཨའི་པི་ས�
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། "
+msgstr "ཨེབ་འཕྲུལ་ལག་ལེན་འཐབ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2453,8 +2565,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "ཐུམ་སྒྲིས་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ མི་མཐུན་པའི་འཐོན་རིམ་ཅིག་ཨིན་པས།"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "ཐུམ་སྒྲིལ་འདྲ་མཛོད་ཡིག་སྣོད་འདི་ངན་ཅན་ཨིན་པས།"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2534,18 +2647,19 @@ msgid "Dependency generation"
 msgstr "བརྟེན་པའི་བཟོ་བཏོན།"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "འཐོབ་ཚུགས་པའི་བརྡ་དོན་མཉམ་བསྡོམས་འབད་དོ།"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "%s་ག་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2558,29 +2672,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་  འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2635,9 +2749,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2677,25 +2791,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "དཀའ་ངལ་འདི་ནོར་བཅོས་འབད་མ་ཚུགས་ ཁྱོད་ཀྱི་ཐུམ་སྒྲིལ་ཆད་པ་ཚུ་འཆང་འདི་འདུག"
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"ཟུར་ཐོ་ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ནུག་  འདི་ཚུ་སྣང་མེད་སྦེ་བཞགཔ་མ་ཚད་ ཚབ་ལུ་"
+"རྙིངམ་འདི་ཚུ་ལག་ལེན་འཐབ་ནུག"
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "ཡིག་མཛོད་སྣོད་ཐོ་ %s་ ཆ་ཤས་འདི་བརླག་སྟོར་ཞུགས་ཏེ་འདུག"
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2707,7 +2824,7 @@ msgstr "%li་ གི་བརླག་སྟོར་ཞུགས་པའི�
 #: apt-pkg/acquire.cc:895
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "%li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
+msgstr " %li་གི་བརླག་སྟོར་ཟུགསཔའི་ཡིག་སྣོད་ %li"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -2763,9 +2880,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་  ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2790,9 +2907,9 @@ msgstr "འདྲ་མཛོད་ལུ་མཐུན་འགྱུར་མ
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2803,8 +2920,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "པའོ་་་ཁྱོད་ཀྱིས་ ཨེ་པི་ཊི་འདི་གིས་བཟོད་ཐུབ་པའི་ཐོན་རིམ་ཨང་གྲངས་ལས་ལྷག་ནུག"
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2844,8 +2962,9 @@ msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་�
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2855,9 +2974,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2894,8 +3013,8 @@ msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
-"%s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ འ་"
-"ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
+" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
+"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
 #: apt-pkg/acquire-item.cc:1705
 #, c-format
@@ -2903,8 +3022,8 @@ msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
-"%s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ འ་"
-"ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག"
+" %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
+"འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
 
 #: apt-pkg/acquire-item.cc:1764
 #, c-format
@@ -2918,14 +3037,14 @@ msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2933,14 +3052,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2953,26 +3072,27 @@ msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"%s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
+" %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
 "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་འབད་དོ།\n"
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "ངོས་འཛིན་འབད་དོ.. "
+msgstr "ངོས་འཛིན་འབད་དོ.."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s\n"
+msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "སི་ཌི་-རོམ་སྦྱར་བརྩེགས་མ་འབད་བར་བཞག་དོ..."
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "%s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
+msgstr " %s སི་ཌི-རོམ་སྦྱར་བརྩེགས་ཀྱི་ས་ཚིགས་ལག་ལེན་འཐབ་དོ།\n"
 
 #: apt-pkg/cdrom.cc:660
 msgid "Unmounting CD-ROM\n"
@@ -2991,11 +3111,11 @@ msgid "Scanning disc for index files..\n"
 msgstr "ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་གི་དོན་ལུ་ ཌིསིཀ་ཞིབ་ལྟ་འབད་དོ..\n"
 
 #: apt-pkg/cdrom.cc:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
-msgstr ""
+msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
@@ -3004,9 +3124,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:782
-#, c-format
+#, fuzzy, c-format
 msgid "Found label '%s'\n"
-msgstr ""
+msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3061,9 +3181,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3072,9 +3192,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3087,14 +3207,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3144,9 +3264,9 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "གཞི་བཙུགས་འབད་ཡོད་པའི་%s།"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
@@ -3159,9 +3279,9 @@ msgid "Removing %s"
 msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3175,14 +3295,14 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "ཐོ་བཀོད་འབད་མི་སྣོད་ཐོ་%s་ཆ་ཤས་འདི་བརླག་སྟོར་ཟུགས་ཏེ་འདུག"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3192,7 +3312,7 @@ msgstr "%s་ གྲ་སྒྲིག་འབད་དོ།"
 #: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Unpacking %s"
-msgstr "%s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
+msgstr " %s་ གི་སྦུང་ཚན་བཟོ་བཤོལ་འབད་དོ།"
 
 #: apt-pkg/deb/dpkgpm.cc:950
 #, c-format
@@ -3282,9 +3402,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3298,80 +3418,204 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
+#~ msgid "Failed to remove %s"
+#~ msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+#~ msgid "Unable to create %s"
+#~ msgstr "%s་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "ནུས་ཅན་ཡོད་པའི་ཚད་འཛིན་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "%sinfo་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "ཨེམ་ཌི་༥་ འཛོལ་བ་མིང་དཔྱད་འབད་དོ། པར་ལེན་ %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "བདག་སྐྱོང་སྣོད་ཐོ་ %sinfo་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "གནད་ཚད་ཡིག་སྣོད་དབྱེ་ཚན་ནང་ལུ་ རིམ་སྒྲིག་ཡིག་སྣོད་བྱང་ཉེས། པར་ལེན་ %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "ནང་འཁོད་འཛོལ་བ་གིས་ཐུམ་སྒྲིལ་མིང་ཅིག་ལེན་དོ།"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "ཐུམ་སྒྲིལ་ཅིག་འཚོལ་་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན:མགོ་ཡིག་ པར་ལེན%lu"
+#~ msgid "Reading file listing"
+#~ msgstr "ཡིག་ཐོ་བཀོད་འབད་མི་ཚུ་ལྷག་དོ།"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "པི་ཀེ་ཇི་ འདྲ་མཛོད་དེ་ དང་པ་རང་འགོ་བྱེད་འབད་དགོ"
+#~ 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'ཡིག་སྣོད་ཐོག་ཡིག་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། ཁྱོད་ཀྱི་ཡིག་སྣོད་འདི་སོར་ཆུད་འབད་མ་"
+#~ "ཚུགས་པ་ཅིན་ འདི་སྟོངམ་བཟོ་བཞིནམ་ལས་ དེ་འཕྲལ་ལས་རང་ཐུམ་སྒྲིལ་གི་འཐོན་རིམ་གཅིགཔ་འདི་རང་ལོང་གཞི་"
+#~ "བཙུགས་འབད།"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "ནང་འཁོད་འཛོལ་ ཁ་ཕྱོགས་ཅིག་ཁ་སྐོང་རྐྱབ་དོ།"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "%sinfo/%s་ཡིག་སྣོད་ཐོ་བཀོད་འདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
+#~ msgid "Internal error getting a node"
+#~ msgstr "ནང་འཁོད་འཛོལ་བ་གིས་མཐུད་མཚམས་ལེན་དོ།"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "ཁ་ཕྱོགས་ཡིག་སྣོད་%sdiversionsཚུ་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "ཁ་ཕྱོགས་ཡིག་སྣོད་འདི་ངན་ཅན་འགྱོ་ནུག"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "ཁ་ཕྱོགས་ཡིག་སྣོད་%sdiversionsཚུ་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "%s་ཁ་ཕྱོགས་ཡིག་སྣོད་ནང་ནུས་མེད་གྲལ་ཐིག"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "ནང་འཁོད་འཛོལ་བ་གིས་མཐུད་མཚམས་ལེན་དོ།"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "ནང་འཁོད་འཛོལ་ ཁ་ཕྱོགས་ཅིག་ཁ་སྐོང་རྐྱབ་དོ།"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "%sinfo/%s་ཡིག་སྣོད་ཐོ་བཀོད་འདི་ལྷག་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "པི་ཀེ་ཇི་ འདྲ་མཛོད་དེ་ དང་པ་རང་འགོ་བྱེད་འབད་དགོ"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "ཐུམ་སྒྲིལ་ཅིག་འཚོལ་་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན:མགོ་ཡིག་ པར་ལེན%lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "གནད་ཚད་ཡིག་སྣོད་དབྱེ་ཚན་ནང་ལུ་ རིམ་སྒྲིག་ཡིག་སྣོད་བྱང་ཉེས། པར་ལེན་ %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "ཨེམ་ཌི་༥་ འཛོལ་བ་མིང་དཔྱད་འབད་དོ། པར་ལེན་ %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚུགས།"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "ནུས་ཅན་ཡོད་པའི་ཚད་འཛིན་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s་གི་དོན་ལུ་རྒྱུད་དུང་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s་ལས་སྦྱོར་ནང་ལས་འཛོལ་བ་ཚུ་ལྷག"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "%u་ཡིག་འབྲུ་ཚུ་གི་ལྟག་ལས་མགོ་ཡིག་རྐྱང་པ་ཅིག་ཐོབ་ཡོད།"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%s གྲལ་ཐིག་%lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "བཟོ་ཉེས་གྱུར་བའི་ཟུར་བཞག་%sགྲལ་ཐིག%lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "ཨེབ་བཤོལ་འཕྲུལ་ཆས།"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "ལྷག་  ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "འབྲི་  ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s (ཐུམ་སྒྲིལ་གསརཔ་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s (ལག་ལེན་འཐུམ་སྒྲིལ་ ༢་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་འཐོན་ནུག"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr " %s (འཐོན་རིམ་གསརཔ་ ༡་)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s (ལག་ལེན་ཐུམ་སྒྲིལ་ ༣་)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོབ་ཅིག་བྱུང་ནུག"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s (པི་ཀེ་ཇི་འཚོལ་ནི)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "ནང་འཁོད་འཛོལ་བ་  འཐུས་མི་ག་ཡོད་འཚོལ་མ་ཐོབ།"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག  ཕྱིར་"
+#~ "འཐོན་དོ།"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "%s (འཐོན་རིམ་གསརཔ་ ༢)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "སྣོད་ཐོ་%s་ལས་སྦྱོར་འབདཝ་ད་འཛོལ་བ་འཐོན་ཡི།"
 
 #~ 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!"
+#~ "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 ""
-#~ "'%sinfo/%s'ཡིག་སྣོད་ཐོག་ཡིག་ཁ་ཕྱེ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད། ཁྱོད་ཀྱི་ཡིག་སྣོད་འདི་སོར་ཆུད་འབད་མ་"
-#~ "ཚུགས་པ་ཅིན་ འདི་སྟོངམ་བཟོ་བཞིནམ་ལས་ དེ་འཕྲལ་ལས་རང་ཐུམ་སྒྲིལ་གི་འཐོན་རིམ་གཅིགཔ་འདི་རང་ལོང་གཞི་"
-#~ "བཙུགས་འབད།"
+#~ "ད་ཚུན་ཁྱོད་ཀྱི་བཀོལ་སྤྱོད་རྐྱང་པ་ཅིག་རྐྱང་པ་ རྐྱངམ་ཅིག་ཞུ་བ་འབད་ཡོདཔ་ལས་ ཧ་ཅང་གི་ཐུམ་སྒྲིལ་འདི་གཞི་"
+#~ "བཙུགས་འབད་མི་བཏུབ་ནི་དེ་སྲིད་ནི་བཟུམ་ཅིག་དང་ཐུམ་སྒྲིལ་དི་གི་ཁ་ཐད་དུ་རྐྱེན་གྱི་སྙན་ཞུ་འདི་བཀང་བཞག་དགོ"
 
-#~ msgid "Reading file listing"
-#~ msgstr "ཡིག་ཐོ་བཀོད་འབད་མི་ཚུ་ལྷག་དོ།"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "གྲལ་ཐིག་%d་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག(%d་མཐོ་ཤོས)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "ནང་འཁོད་འཛོལ་བ་གིས་ཐུམ་སྒྲིལ་མིང་ཅིག་ལེན་དོ།"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "གྲལ་ཐིག་%d་འདི་གནམ་མེད་ས་མེད་རིངམ་འདུག(%d་མཐོ་ཤོས)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "བདག་སྐྱོང་སྣོད་ཐོ་ %sinfo་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ འཐུས་ཤོར་བྱུང་ཡོད།"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "%s (ཡིག་སྣོད་འཐོན་རིམ་གསརཔ་ ༡)བཟོ་སྦྱོར་འབད་བའི་བསྒང་འཛོལ་བ་ཅིག་བྱུང་ནུག"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "%sinfo་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "གསོག་འཇོག་འབད་ཡོད་པའི་ཁ་ཡིག:%s \n"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "%s་གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr "%i་ཐུམ་སྒྲིལ་གྱི་ཟུར་ཐོ་ཚུ་ཐོབ་ཅི་  %i་འབྱུང་ཁུངས་ཟུར་ཐོ་ཚུ་དང་ %iམིང་རྟགས་ཚུ།\n"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "%s་རྩ་བསྐྲད་གཏང་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
+#~ msgid "File date has changed %s"
+#~ msgstr "ཡིག་སྣོད་ཚེས་གྲངས་འདི་གིས་%sདེ་བསྒྱུར་བཅོས་འབད་ནུག"
diff --git a/po/el.po b/po/el.po
index f4b7ca84b..85f7ece18 100644
--- a/po/el.po
+++ b/po/el.po
@@ -17,16 +17,16 @@ msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-08-28 19:42+0000\n"
-"Last-Translator: Natsisthanasis <Unknown>\n"
+"PO-Revision-Date: 2008-08-26 18:25+0300\n"
+"Last-Translator: Θανάσης Νάτσης <natsisthanasis@gmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"org>\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -47,19 +47,19 @@ msgstr "  Κανονικά Πακέτα: "
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Πλήρως Εικονικά Πακέτα: "
+msgstr " Πλήρως Εικονικά Πακέτα: "
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  Μονά Εικονικά Πακέτα: "
+msgstr " Μονά Εικονικά Πακέτα: "
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  Μικτά Εικονικά Πακέτα: "
+msgstr " Μικτά Εικονικά Πακέτα: "
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  Αγνοούμενα: "
+msgstr "Αγνοούμενα: "
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
@@ -157,7 +157,7 @@ msgstr "(κανένα)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  Καθήλωση Πακέτου: "
+msgstr " Καθήλωση Πακέτου: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -173,6 +173,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -208,6 +209,43 @@ 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"
+"\n"
+"το apt-cache είναι ένα χαμηλού επιπέδου εργαλείο που χρησιμοποιείται για \n"
+"το χειρισμό των δυαδικών αρχείων cache του APT, και να εξάγει πληροφορίες\n"
+"από αυτά\n"
+"\n"
+"Εντολές:\n"
+"   add - Προσθέτει ένα αρχείο πακέτου στη cache πηγών\n"
+"   gencaches - Κατασκευή της cache των πακέτων και των πηγών\n"
+"   showpkg - Εμφάνιση μερικών γενικών πληροφοριών για ένα πακέτο\n"
+"   showsrc - Εμφάνιση εγγραφών για πηγαίο πακέτο\n"
+"   stats - Εμφάνιση μερικών βασικών στατιστικών\n"
+"   dump - Εμφάνιση όλου του αρχείου σε περιληπτική μορφή.\n"
+"   dumpavail - Εκτύπωση της λίστας των διαθέσιμων πακέτων στην κανονική "
+"έξοδο\n"
+"   unmet - Εμφάνιση μη ικανοποιούμενων εξαρτήσεων\n"
+"   search - Αναζήτηση στη λίστα πακέτων για αυτή τη κανονική παράσταση\n"
+"   show - Εμφάνιση μιας αναγνώσιμης εγγραφής για το πακέτο\n"
+"   depends - Εμφάνιση των εξαρτήσεων ενός πακέτου\n"
+"   rdepends - Εμφάνιση αντίστροφων εξαρτήσεων ενός πακέτου\n"
+"   pkgnames - Εμφάνιση λίστας με τα ονόματα όλων των πακέτων\n"
+"   dotty - Παραγωγή γραφημάτων πακέτων για το GraphViz\n"
+"   xvcg - Παραγωγή γραφημάτων πακέτων για το xvcg\n"
+"   policy - Εμφάνιση προτεραιοτήτων πηγών\n"
+"\n"
+"Επιλογές:\n"
+"  -h   Αυτό το κείμενο βοήθειας.\n"
+"  -p=? Η cache πακέτων.\n"
+"  -s=? Η cache πηγών.\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:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -347,12 +385,12 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu για αναβάθμιση, %lu νέο εγκατεστημένα, "
+msgstr "%lu αναβαθμίστηκαν, %lu νέο εγκατεστημένα, "
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu επανεγκατεστημένα, "
+msgstr "%lu επανεγκατεστημένα,"
 
 #: cmdline/apt-get.cc:608
 #, c-format
@@ -370,14 +408,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu μη πλήρως εγκατεστημένα ή αφαιρέθηκαν.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -390,7 +428,7 @@ msgstr " [Εγκατεστημένα]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [Μγ Υποψήφια Εκδόση]"
+msgstr "[Μγ Υποψήφια Εκδόση]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -612,7 +650,7 @@ msgstr "Εγκατάλειψη."
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "Θέλετε να συνεχίσετε [Y/n]; "
+msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -724,12 +762,14 @@ msgstr[1] ""
 "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] ""
+"%lu το ακόλουθο πακέτο εγκαταστάθηκε αυτόματα και δεν χρειάζεται πλέον:"
 msgstr[1] ""
+"%lu τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -1000,6 +1040,7 @@ msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1044,6 +1085,44 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Χρήση: apt-get [παράμετροι] εντολή\n"
+"       apt-get [παράμετροι] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [παράμετροι] source pkg1 [pkg2 ...]\n"
+"\n"
+"η apt-get είναι μια απλή διασύνδεση για τη μεταφόρτωση και την\n"
+"εγκατάσταση πακέτων. Οι πιο συχνές εντολές είναι η update\n"
+"και η install.\n"
+"\n"
+"Εντολές:\n"
+"   update - Ανάκτηση νέων καταλόγων πακέτων\n"
+"   upgrade - Διενέργεια αναβάθμισης\n"
+"   install - Εγκατάσταση νέων πακέτων (χωρίς την επέκταση .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"
+"                       This APT has Super Cow Powers.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1091,29 +1170,29 @@ msgstr ""
 "στη συσκευή '%s' και πιέστε  enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "αλλά δεν είναι εγκατεστημένο"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1122,14 +1201,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Αποτυχία ανοίγματος του %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1348,7 +1427,7 @@ msgstr "Επερώτηση"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "Αδύνατη η εκτέλεση "
+msgstr "Αδύνατη η εκτέλεση"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1398,14 +1477,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Αδύνατη η σύνδεση στο %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1419,8 +1498,11 @@ msgid "At least one invalid signature was encountered."
 msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
+"Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι "
+"εγκατεστημένο το gpgv;)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1540,9 +1622,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1585,12 +1667,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Επιθυμείτε τη διαγραφή ήδη μεταφορτωμένων αρχείων .deb;"
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "Προέκυψανσφάλματα κατά την αποσυμπίεση. Θα ρυθμίσω τα "
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "πακέτα που εγκαταστάθηκαν. Αυτό μπορεί να παράγει διπλά λάθη"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1775,10 +1859,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
+"Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη "
+"έκδοση, παρακαλώ αφαιρέστε και δημιουργήστε τη βάση εκ νέου."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1819,7 +1906,7 @@ msgstr "W: "
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "E: Σφάλματα στο αρχείο "
+msgstr "E: Σφάλματα στο αρχείο"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
@@ -1838,7 +1925,7 @@ msgstr "Αποτυχία ανοίγματος του %s"
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " Αποσύνδεση %s [%s]\n"
+msgstr "Αποσύνδεση %s [%s]\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
@@ -1853,7 +1940,7 @@ msgstr "Αποτυχία αποσύνδεσης του %s"
 #: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "Αποτυχία σύνδεσης του %s με το %s"
+msgstr "    Αποτυχία σύνδεσης του %s με το %s"
 
 #: ftparchive/writer.cc:296
 #, c-format
@@ -1894,19 +1981,19 @@ msgid "Unable to open %s"
 msgstr "Αδύνατο το άνοιγμα του %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1959,6 +2046,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Αποτυχία μετονομασίας του %s σε %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1971,6 +2059,16 @@ 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"
+"\n"
+"το apt-extracttemplates είναι ένα βοήθημα για να εξάγετε ρυθμίσεις \n"
+"και πρότυπα από πακέτα debian\n"
+"\n"
+"Επιλογές:\n"
+"  -h   Το παρόν κείμενο βοήθειας\n"
+"  -t   Καθορισμός προσωρινού καταλόγου\n"
+"  -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n"
+"  -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2031,9 +2129,9 @@ msgid "Error reading archive member header"
 msgstr "Σφάλμα κατά την ανάγνωση της επικεφαλίδας του μέλους της αρχειοθήκης"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Μη έγκυρη επικεφαλίδα μέλος της αρχειοθήκης"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2166,22 +2264,24 @@ msgid "Can't mmap an empty file"
 msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Αδύνατο το άνοιγμα του %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Αδύνατη η εκτέλεση"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2189,8 +2289,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2287,9 +2388,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
+"Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2363,9 +2465,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2417,9 +2519,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2437,9 +2539,9 @@ msgid "Could not open file %s"
 msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2450,29 +2552,29 @@ msgid "Failed to exec compressor "
 msgstr "Αποτυχία εκτέλεσης του συμπιεστή "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Πρόβλημα κατά την διαγραφή του αρχείου"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2491,8 +2593,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Το αρχείο cache των πακέτων είναι ασύμβατης έκδοσης"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Το αρχείο cache των πακέτων είναι κατεστραμμένο"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2596,29 +2699,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2663,7 +2766,7 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ�
 #: apt-pkg/sourcelist.cc:289
 #, 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/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2673,9 +2776,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2715,25 +2818,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Αδύνατη η διόρθωση προβλημάτων, έχετε κρατούμενα ελαττωματικά πακέτα."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Μερικά αρχεία δεν μεταφορτώθηκαν, αγνοήθηκαν ή χρησιμοποιήθηκαν παλαιότερα "
+"στη θέση τους."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Ο φάκελος λιστών %spartial αγνοείται."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Ο φάκελος αρχειοθηκών %spartial αγνοείται."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2804,9 +2910,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2832,9 +2938,9 @@ msgstr "Η cache έχει ασύμβατο σύστημα απόδοσης έκ�
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2901,9 +3007,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2965,14 +3071,14 @@ msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2980,14 +3086,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3005,12 +3111,12 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Αναγνώριση... "
+msgstr "Αναγνώριση..."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Αποθήκευση Ετικέτας: %s\n"
+msgstr "Αποθήκευση Ετικέτας: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3055,11 +3161,11 @@ msgstr ""
 #: apt-pkg/cdrom.cc:782
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "Εύρεση ετικέτας: %s\n"
+msgstr "Εύρεση ετικέτας: %s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
-msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά.\n"
+msgstr "Αυτό δεν είναι έγκυρο όνομα, προσπαθείστε ξανά. \n"
 
 #: apt-pkg/cdrom.cc:828
 #, c-format
@@ -3080,7 +3186,7 @@ msgstr "Eγγραφή νέας λίστας πηγών\n"
 
 #: apt-pkg/cdrom.cc:865
 msgid "Source list entries for this disc are:\n"
-msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι:\n"
+msgstr "Οι κατάλογοι με τις πηγές αυτού του δίσκου είναι: \n"
 
 #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
 #, c-format
@@ -3108,9 +3214,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Ανόμοιο MD5Sum"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3119,9 +3225,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Εγκατάλειψη της εγκατάστασης."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3134,14 +3240,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3206,9 +3312,9 @@ msgid "Removing %s"
 msgstr "Αφαιρώ το %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "Το %s διαγράφηκε πλήρως"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3227,9 +3333,9 @@ msgid "Directory '%s' missing"
 msgstr "Ο φάκελος %s αγνοείται."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Αδύνατο το άνοιγμα του αρχείου %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3331,9 +3437,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3347,84 +3453,168 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Αποτυχία διαγραφής του %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Αδύνατη η δημιουργία του %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Αποτυχία εύρεσης της κατάστασης του %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Αδύνατη η αλλαγή σε %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή  %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο διαχείρισης %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Ελαττωματική εγγραφή ConfFile στο αρχείο κατάστασης. Γραμμή %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Αποτυχία εύρεσης μιας κεφαλίδας Package:, γραμμή %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Ανάγνωση Λίστας Πακέτων"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί"
+#~ 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'.Εάν δε μπορείτε "
+#~ "να επαναφέρετε το αρχείο, τότε αδειάστε το και άμεσα εγκαταστήστε ξανά "
+#~ "την ίδια έκδοση του πακέτου!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Αποτυχία κατά την ανάγνωση του αρχείου λίστας %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Εσωτερικό Σφάλμα στη λήψη ενός Κόμβου"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Αποτυχία στο άνοιγμα του αρχείου παρακάμψεων  %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Το αρχείο παρακάμψεων είναι κατεστραμμένο"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Αποτυχία στο άνοιγμα του αρχείου παρακάμψεων  %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Μη έγκυρη γραμμή στο αρχείο παρακάμψεων: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Εσωτερικό Σφάλμα στη λήψη ενός Κόμβου"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Εσωτερικό Σφάλμα στην προσθήκη μιας παράκαμψης"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Αποτυχία κατά την ανάγνωση του αρχείου λίστας %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Η cache των πακέτων θα πρέπει να πρώτα να αρχικοποιηθεί"
 
-#~ 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'.Εάν δε μπορείτε "
-#~ "να επαναφέρετε το αρχείο, τότε αδειάστε το και άμεσα εγκαταστήστε ξανά "
-#~ "την ίδια έκδοση του πακέτου!"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Αποτυχία εύρεσης μιας κεφαλίδας Package:, γραμμή %lu"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Ανάγνωση Λίστας Πακέτων"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Ελαττωματική εγγραφή ConfFile στο αρχείο κατάστασης. Γραμμή %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Εσωτερικό Σφάλμα στην ανάκτηση ενός Ονόματος Πακέτου"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Σφάλμα στην ανάλυση του MD5. Γραμμή  %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Αποτυχία αλλαγής καταλόγου στο φάκελο διαχείρισης %sinfo"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Αδύνατη η αλλαγή σε %s"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Αποτυχία εντοπισμού ενός έγκυρου αρχείου control"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Αδύνατο το άνοιγμα διασωλήνωσης για το %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Σφάλμα ανάγνωσης από τη διεργασία %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Λήψη μίας και μόνης γραμμής επικεφαλίδας πάνω από %u χαρακτήρες"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Κακογραμμένη παρακαμπτήρια %s γραμμή %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "αποσυμπιεστής"
+
+#~ msgid "read, still have %lu to read but none left"
 #~ msgstr ""
-#~ "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων"
+#~ "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Αποτυχία εύρεσης της κατάστασης του %sinfo"
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Αδύνατη η δημιουργία του %s"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewPackage)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Αποτυχία διαγραφής του %s"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc1)"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage2)"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Προέκευψε σφάλμα κατά την επεξεργασία του %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Εσωτερικό Σφάλμα, αδυναμία εντοπισμού του μέλους"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία του %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Αδύνατη η διόρθωση του αρχείου"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Επεξεργασία triggers για το %s"
+
+#~ 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"
+#~ "αναφορά σφάλματος για αυτό το πακέτο."
diff --git a/po/es.po b/po/es.po
index 13c4005ea..3c7d6fd5a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@
 #    - Asier Llano Palacios <asierllano@infonegocio.com>
 #    - Ruben Porras Campo <nahoo@inicia.es> 2004
 #
-#  Traductores, si no conoce el formato PO, merece la pena leer la
+#  Traductores, si no conoce el formato PO, merece la pena leer la 
 #  documentación de gettext, especialmente las secciones dedicadas a este
 #  formato, por ejemplo ejecutando:
 #          info -n '(gettext)PO Files'
@@ -27,23 +27,49 @@
 #  Si tiene dudas o consultas sobre esta traducción consulte con el último
 #  traductor (campo Last-Translator) y ponga en copia a la lista de
 #  traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>)
-# Paco Molinero <paco@byasl.com>, 2011.
+#
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.10\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-17 16:36+0000\n"
-"Last-Translator: Paco Molinero <paco@byasl.com>\n"
+"PO-Revision-Date: 2011-01-24 11:47+0100\n"
+"Last-Translator: Javier Fernández-Sanguino Peña <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-POFile-SpellExtra: BD getaddrinfo dist show xvcg Filename sources cachés\n"
+"X-POFile-SpellExtra: dumpavail apport scanpackages yes pts URIs upgrade\n"
+"X-POFile-SpellExtra: Hash TAR mmap fix Immediate li source add Pathprefix\n"
+"X-POFile-SpellExtra: ftparchive policy main URIS qq Resolve Incoming\n"
+"X-POFile-SpellExtra: NewFileVer depends get libc GPG URI sdiversions\n"
+"X-POFile-SpellExtra: Length Limit PASS ConfFile NewVersion showpkg IPC\n"
+"X-POFile-SpellExtra: Super unmet APT registrable NewPackage AddDiversion\n"
+"X-POFile-SpellExtra: dists release dselect dir Hmmm debconf force dump ej\n"
+"X-POFile-SpellExtra: list Section GraphViz Priority FindPkg gencaches\n"
+"X-POFile-SpellExtra: Valid remove Ign DEB PORT LoopBreak tmp ftp\n"
+"X-POFile-SpellExtra: AutoRemover stats AF Until delink unmarkauto firms\n"
+"X-POFile-SpellExtra: ref Dpkg tar autoremove Obj missing update binary\n"
+"X-POFile-SpellExtra: sobreescribe proxy org packages debs generate MD\n"
+"X-POFile-SpellExtra: search ProxyLogin limin AllUpgrade Md Range dotty Pre\n"
+"X-POFile-SpellExtra: NewFileDesc empaquetamiento root realloc gpgv apt\n"
+"X-POFile-SpellExtra: pkgnames Release BinaryPath old DeLink showauto\n"
+"X-POFile-SpellExtra: pkgProblemResolver parseable nstall\n"
+"X-POFile-SpellExtra: desempaquetamiento script DESACTUALIZARÁN\n"
+"X-POFile-SpellExtra: InstallPackages PreDepende lu sobreescribir Packages\n"
+"X-POFile-SpellExtra: shell desincronizado override MaxReports cdrom dpkg\n"
+"X-POFile-SpellExtra: socket info md Force temp dep CollectFileProvides\n"
+"X-POFile-SpellExtra: spartial scansources Only dev purge nfs Intro install\n"
+"X-POFile-SpellExtra: deb Sobreescribiendo openpty USER UsePackage vd\n"
+"X-POFile-SpellExtra: markauto DB DropNode Content rdepends conf zu hash\n"
+"X-POFile-SpellExtra: check contents paq Err Sources MMap lih decompresor\n"
+"X-POFile-SpellExtra: build config EPRT http Package liseg dscs Remove\n"
+"X-POFile-SpellExtra: sortpkgs sB man extracttemplates bzr potato clear\n"
+"X-POFile-SpellExtra: autoclean showsrc desactualizados clean gzip TYPE\n"
 "X-POFile-SpellExtra: sinfo Acquire\n"
 
 #: cmdline/apt-cache.cc:158
@@ -101,7 +127,7 @@ msgstr "Relaciones descripción/archivo totales: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "Asignación total de provisiones: "
+msgstr "Mapeo Total de Provisiones: "
 
 # globbed -> globalizadas ? (jfs)
 #: cmdline/apt-cache.cc:357
@@ -192,6 +218,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -227,42 +254,46 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
-"Uso: apt-cache [opciones] orden\n"
-"       apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
-"       apt-cache [opciones] showsrc paq1 [paq2 ...]\n"
+"Modo de uso: apt-cache [opciones] orden\n"
+"             apt-cache [opciones] add archivo1 [archivo2 ...]\n"
+"             apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
+"             apt-cache [opciones] showsrc paq1 [paq2 ...]\n"
 "\n"
-"apt-cache es una herramienta de bajo nivel usada para solicitar información\n"
-"de archivos de caché binarios de APT\n"
+"apt-cache es una herramienta de bajo nivel que se utiliza para manipular\n"
+"los archivos binarios de caché de APT y consultar información sobre éstos\n"
 "\n"
 "Órdenes:\n"
-"   gencaches - Construye el paquete y la caché de origen\n"
-"   showpkg - Muestra información general para un paquete\n"
-"   showsrc - Muestra registros del origen\n"
+"   add - Agrega un archivo de paquete a la caché de fuentes\n"
+"   gencaches - Crea ambas cachés, la de paquetes y la de fuentes\n"
+"   showpkg - Muestra información general para un solo paquete\n"
+"   showsrc - Muestra la información de fuentes\n"
 "   stats - Muestra algunas estadísticas básicas\n"
-"   dump - Muestra el archivo entero en formato breve\n"
-"   dumpavail - Imprime un archivo disponible en la salida estándar\n"
-"   unmet - Muestra dependencia no conseguidas\n"
-"   search - Busca una lista de paquetes para un patrón de expresión de "
-"registro\n"
+"   dump - Muestra el archivo entero en un formato terso\n"
+"   dumpavail - Imprime un archivo disponible a la salida estándar\n"
+"   unmet - Muestra dependencias incumplidas\n"
+"   search - Busca en la lista de paquetes por un patrón de expresión "
+"regular\n"
 "   show - Muestra un registro legible para el paquete\n"
-"   depends - Muestra información de dependencia en bruto para un paquete\n"
-"   rdepends - Muestra información de la dependencia inversa para un paquete\n"
+"   showauto - Muestra una lista de los paquetes instalados de forma "
+"automática\n"
+"   depends - Muestra la información de dependencias en bruto para el "
+"paquete\n"
+"   rdepends - Muestra la información de dependencias inversas del paquete\n"
 "   pkgnames - Lista los nombres de todos los paquetes en el sistema\n"
-"   dotty - Genera gráficos de paquete para GraphViz\n"
-"   xvcg - Genera gráficos de paquete para xvcg\n"
-"   policy - Muestra la configuración de la política\n"
+"   dotty - Genera gráficas del paquete para GraphViz\n"
+"   xvcg - Genera gráficas del paquete para xvcg\n"
+"   policy - Muestra parámetros de las normas\n"
 "\n"
 "Opciones:\n"
 "  -h   Este texto de ayuda.\n"
-"  -p=? El caché de paquete.\n"
-"  -s=? El caché de origen.\n"
-"  -q   Desactiva el indicador de progreso.\n"
-"  -i   Muestra solo dependencias importantes para la orden no conseguida.\n"
+"  -p=? La caché de paquetes.\n"
+"  -s=? La caché de fuentes.\n"
+"  -q   Deshabilita el indicador de progreso.\n"
+"  -i   Muestra sólo dependencias importantes para la orden incumplida.\n"
 "  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, es decir -o dir::"
-"cache=/tmp\n"
-"Vea las páginas de manual de apt-cache(8) y apt.conf(5) para tener más "
-"información.\n"
+"  -o=? Establece una opción de configuración arbitraria, \n"
+"       p.ej. -o dir::cache=/tmp\n"
+"Vea las páginas del manual apt-cache(8) y apt.conf(5) para más información.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -271,7 +302,7 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Introduzca un disco en la unidad y pulse Intro"
+msgstr "Por favor, introduzca un disco en la unidad y pulse Intro"
 
 #: cmdline/apt-cdrom.cc:129
 #, c-format
@@ -280,7 +311,7 @@ msgstr "No se pudo montar «%s» como «%s»"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Repita este proceso para el resto de los CD del conjunto."
+msgstr "Repita este proceso para el resto de los CDs del conjunto."
 
 #: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
@@ -305,8 +336,8 @@ msgstr ""
 "\n"
 "apt-config es una herramienta para leer el archivo de configuración de APT.\n"
 "\n"
-"Órdenes:\n"
-"   shell - Modo intérprete\n"
+"Comandos:\n"
+"   shell - Modo shell\n"
 "   dump - Muestra la configuración\n"
 "\n"
 "Opciones:\n"
@@ -459,8 +490,8 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 "El paquete %s no está disponible, pero algún otro paquete hace referencia\n"
-"a él. Esto puede significar que el paquete falta, está obsoleto o solo se\n"
-"encuentra disponible desde alguna otro origen\n"
+"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:700
 msgid "However the following packages replace it:"
@@ -478,15 +509,14 @@ msgstr "No pueden eliminarse los paquetes virtuales como «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"El paquete «%s» no está instalado, no se puede eliminar. ¿Quiso decir «%s»?\n"
+msgstr "El paquete %s no está instalado, no se eliminará\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr "El paquete «%s» no está instalado, no se puede eliminar\n"
+msgstr "El paquete %s no está instalado, no se eliminará\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -502,7 +532,7 @@ msgstr "Ignorando %s, ya está instalado y no está activada la actualización.\
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
-"Ignorando %s, no está instalado y solo se están solicitando "
+"Ignorando %s, no está instalado y sólo se están solicitando "
 "actualizaciones.\n"
 
 #: cmdline/apt-get.cc:834
@@ -518,7 +548,7 @@ msgstr "%s ya está en su versión más reciente.\n"
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
-msgstr "Fijado %s como instalado manualmente.\n"
+msgstr "fijado %s como instalado manualmente.\n"
 
 #: cmdline/apt-get.cc:884
 #, c-format
@@ -526,9 +556,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versión seleccionada «%s» (%s) para «%s» porque «%s»\n"
+msgstr "Versión seleccionada «%s» (%s) para «%s»\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -584,7 +614,9 @@ msgstr "Error interno, ¡se llamó a «InstallPackages» con paquetes rotos!"
 
 #: cmdline/apt-get.cc:1140
 msgid "Packages need to be removed but remove is disabled."
-msgstr "Los paquetes necesitan eliminarse pero eliminar está desactivado."
+msgstr ""
+"Los paquetes necesitan eliminarse pero está deshabilitado la posibilidad de "
+"eliminar."
 
 #: cmdline/apt-get.cc:1151
 msgid "Internal error, Ordering didn't finish"
@@ -608,7 +640,7 @@ msgstr "Se necesita descargar %sB/%sB de archivos.\n"
 #: cmdline/apt-get.cc:1201
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "Se necesita descargar %sB de archivos.\n"
+msgstr "Necesito descargar %sB de archivos.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -661,7 +693,7 @@ msgstr "Abortado."
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "¿Quiere continuar [S/n]? "
+msgstr "¿Desea continuar [S/n]? "
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -674,7 +706,7 @@ msgstr "No se pudieron descargar algunos archivos"
 
 #: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
 msgid "Download complete and in download only mode"
-msgstr "Descarga completa y en modo de solo descarga"
+msgstr "Descarga completa y en modo de sólo descarga"
 
 #: cmdline/apt-get.cc:1379
 msgid ""
@@ -705,7 +737,7 @@ msgid_plural ""
 "all files have been overwritten by other packages:"
 msgstr[0] ""
 "El paquete mostrado a continuación ha desaparecido de su sistema\n"
-"dado que todos sus archivos han sido sobreescritos por otros paquetes:"
+"dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
 msgstr[1] ""
 "Los paquetes mostrados a continuación han desaparecido de su sistema\n"
 "dado que todos sus ficheros han sido sobreescritos por otros paquetes:"
@@ -722,7 +754,7 @@ msgstr "Ignorar la distribución objetivo no disponible «%s» del paquete «%s�
 #: cmdline/apt-get.cc:1591
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Escogiendo «%s» como paquete origen en lugar de «%s»\n"
+msgstr "Escogiendo «%s» como paquete fuente en lugar de «%s»\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -732,7 +764,7 @@ msgstr "Ignorar la versión no disponible «%s» del paquete «%s»"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
-msgstr "la orden de actualización no toma argumentos"
+msgstr "El comando de actualización no toma argumentos"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
@@ -788,10 +820,11 @@ msgstr[1] ""
 "Se instalaron de forma automática %lu paquetes y ya no son necesarios.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Use «apt-get autoremove» para eliminarlo."
-msgstr[1] "Use «apt-get autoremove» para eliminarlos."
+msgstr[0] "Utilice «apt-get autoremove» para eliminarlos."
+msgstr[1] "Utilice «apt-get autoremove» para eliminarlos."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -887,7 +920,7 @@ msgstr "Descargando %s %s"
 
 #: cmdline/apt-get.cc:2451
 msgid "Must specify at least one package to fetch source for"
-msgstr "Debe especificar al menos un paquete para obtener su código origen"
+msgstr "Debe especificar al menos un paquete para obtener su código fuente"
 
 #: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
 #, c-format
@@ -905,21 +938,21 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Por favor, use:\n"
-"bzr derivación %s\n"
-"para recuperar las últimas (posiblemente sin publicar) actualizaciones del "
-"paquete.\n"
+"Por favor, utilice:\n"
+"bzr get %s\n"
+"para obtener las últimas actualizaciones (posiblemente no publicadas aún) "
+"del paquete.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Ignorando archivo ya descargado «%s»\n"
+msgstr "Omitiendo el fichero ya descargado «%s»\n"
 
 #: cmdline/apt-get.cc:2603
 #, c-format
@@ -931,19 +964,19 @@ msgstr "No tiene suficiente espacio libre en %s"
 #: cmdline/apt-get.cc:2612
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Se necesita descargar %sB/%sB de archivos del origen.\n"
+msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:2617
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Se necesita descargar %sB de archivos origen.\n"
+msgstr "Necesito descargar %sB de archivos fuente.\n"
 
 #: cmdline/apt-get.cc:2623
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Origen obtenido %s\n"
+msgstr "Fuente obtenida %s\n"
 
 #: cmdline/apt-get.cc:2661
 msgid "Failed to fetch some archives."
@@ -999,13 +1032,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"%s dependencia para %s no se puede satisfacer porque %s no está permitido en "
-"«%sx paquetes"
+"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
+"el paquete %s"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -1024,22 +1057,22 @@ msgstr ""
 "demasiado nuevo"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"%s dependencia para %s no se puede satisfacer, porque la versión candidata "
-"del paquete %s no satisface los requerimientos de la versión"
+"La dependencia %s en %s no puede satisfacerse porque ninguna versión "
+"disponible del paquete %s satisface los requisitos de versión"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"%s dependencia para %s no se puede satisfacer, porque el paquete %s no tiene "
-"versión candidata"
+"La dependencia %s en %s no puede satisfacerse porque no se puede encontrar "
+"el paquete %s"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -1056,15 +1089,16 @@ msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Registro de cambios de %s (%s)"
+msgstr "Conectando a %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1110,51 +1144,49 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "Uso: apt-get [opciones] orden\n"
-"       apt-get [opciones] install|remove paq1 [paq2 ...]\n"
-"       apt-get [opciones] source paq1 [paq2 ...]\n"
+"     apt-get [opciones] install|remove paq1 [paq2 ...]\n"
+"     apt-get [opciones] source paq1 [paq2 ...]\n"
 "\n"
-"apt-get es una interfaz de línea de órdenes sencilla para descargar e "
-"instalar\n"
-"paquetes. Las órdenes más usadas son update\n"
-"e install.\n"
+"apt-get es una sencilla interfaz de línea de órdenes para descargar e\n"
+"instalar paquetes. Las órdenes más utilizadas son update e install.\n"
 "\n"
 "Órdenes:\n"
-"   update - Consigue listas de paquetes nuevos\n"
+"   update - Descarga nuevas listas de paquetes\n"
 "   upgrade - Realiza una actualización\n"
-"   install - Instala paquetes nuevos (paq es libc6 no libc6.deb)\n"
+"   install - Instala nuevos paquetes (paquete es libc6 y no libc6.deb)\n"
 "   remove - Elimina paquetes\n"
-"   autoremove - Elimina automáticamente todos los paquetes no usados\n"
-"   purge - Elimina paquetes y archivos de configuración\n"
-"   source - Descarga archivadores origen\n"
-"   build-dep - Configura las dependencias de compilación para paquetes "
-"origen\n"
+"   purge  - Elimina y purga paquetes\n"
+"   source - Descarga archivos fuente\n"
+"   build-dep - Configura las dependencias de construcción para paquetes "
+"fuente\n"
 "   dist-upgrade - Actualiza la distribución, vea apt-get(8)\n"
-"   dselect-upgrade - Sigue selecciones dselect\n"
-"   clean - Borra archivos de archivadores descargados\n"
-"   autoclean - Borrar archivos de archivadores descargados antiguos\n"
-"   check - Verifica que no hay dependencias rotas\n"
-"   markauto - Marca los paquetes dados como instalados automáticamente\n"
-"   unmarkauto - Marca los paquetes dados como instalados manualmente\n"
-"   changelog - Descarga y muestra el registro de cambios del paquete dado\n"
-"   download - Descarga el paquete binario en el directorio actual\n"
+"   dselect-upgrade - Sigue las selecciones de dselect\n"
+"   clean - Elimina los archivos descargados\n"
+"   autoclean - Elimina los archivos descargados antiguos\n"
+"   check - Verifica que no haya dependencias incumplidas\n"
+"   markauto - Marca los paquetes indicados como instalados de forma "
+"automática\n"
+"   unmarkauto - Marca los paquetes indicados como instalado de forma manual\n"
 "\n"
 "Opciones:\n"
 "  -h  Este texto de ayuda.\n"
-"  -q  Salida registrable, sin indicador de progreso\n"
-"  -qq Sin salida excepto errores\n"
-"  -d  Descarga solo - NO instala o desempaqueta archivadores\n"
-"  -s  No actúa. Realiza una simulación ordenada\n"
-"  -y  Asume que sí a todas las peticiones y no pregunta\n"
-"  -f  Intenta corregir un sistema con dependencias rotas\n"
-"  -m  Intenta continuar si los archivadores son inasignables\n"
-"  -u  Muestra una lista de paquetes actualizados\n"
-"  -b  Compila el paquete origen después de traerlo\n"
-"  -V  Muestra los números de versión largos\n"
+"  -q  Salida registrable - sin indicador de progreso\n"
+"  -qq Sin salida, excepto si hay errores\n"
+"  -d  Sólo descarga - NO instala o desempaqueta los archivos\n"
+"  -s  No actúa. Realiza una simulación\n"
+"  -y  Asume Sí para todas las consultas\n"
+"  -f  Intenta continuar si la comprobación de integridad falla\n"
+"  -m  Intenta continuar si los archivos no son localizables\n"
+"  -u  Muestra también una lista de paquetes actualizados\n"
+"  -b  Construye el paquete fuente después de obtenerlo\n"
+"  -V  Muesta números de versión detallados\n"
 "  -c=? Lee este archivo de configuración\n"
-"  -o=? Establece una opción de configuración arbitraria, -o dir::cache=/tmp\n"
-"Vea las páginas de manual de apt-get(8), sources.list(5) y apt.conf(5)\n"
-"para tener más información y opciones.\n"
-"                       Este APT tiene poderes de super vaca.\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. \n"
+"       -o dir::cache=/tmp\n"
+"Consulte las páginas del manual de apt-get(8), sources.list(5) y apt.conf"
+"(5)\n"
+"para más información y opciones.\n"
+"                       Este APT tiene poderes de Super Vaca.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1163,7 +1195,7 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"NOTA: ¡Esto es solo una simulación\n"
+"NOTA: ¡Esto es sólo una simulación\n"
 "      apt-get necesita privilegios de administrador para la ejecución real.\n"
 "      Tenga también en cuenta que se han desactivado los bloqueos,\n"
 "      ¡no dependa de la relevancia a la situación real actual!"
@@ -1201,34 +1233,34 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"Cambio de medio: Inserte el disco etiquetado\n"
+"Cambio de medio: Por favor, inserte el disco etiquetado como\n"
 " «%s»\n"
-"en la unidad «%s» y presione Intro\n"
+"en la unidad «%s» y pulse Intro\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s no se pueden marcar dado que no está instalado.\n"
+msgstr "pero no está instalado"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s ya se estableció para instalar manualmente.\n"
+msgstr "fijado %s como instalado manualmente.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s ya se estableció para instalar automáticamente.\n"
+msgstr "fijado %s como instalado automáticamente.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s ya fue puesto en espera.\n"
+msgstr "%s ya está en su versión más reciente.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s ya fue puesto en espera.\n"
+msgstr "%s ya está en su versión más reciente.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1237,14 +1269,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Esperaba %s pero no estaba allí"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s establecer en espera.\n"
+msgstr "fijado %s como instalado manualmente.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Cancelado mantener %s\n"
+msgstr "No se pudo abrir %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1302,8 +1334,8 @@ 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 ""
-"Utilice apt-cdrom para hacer que APT reconozca este CD-ROM. apt-get update "
-"no se puede usar para añadir nuevos CD-ROM."
+"Por favor, utilice «apt-cdrom» para hacer que APT reconozca este CD. No "
+"puede utilizar «apt-get update» para añadir nuevos CDs"
 
 #: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
@@ -1320,7 +1352,7 @@ msgstr "Disco no encontrado."
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
-msgstr "Archivo no encontrado"
+msgstr "Fichero no encontrado"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
@@ -1469,7 +1501,7 @@ msgstr "Imposible traer archivo, el servidor dijo «%s»"
 
 #: methods/ftp.cc:900 methods/rsh.cc:330
 msgid "Data socket timed out"
-msgstr "Expiró el zócalo de datos"
+msgstr "Expiró el socket de datos"
 
 #: methods/ftp.cc:930
 #, c-format
@@ -1600,7 +1632,7 @@ msgstr "El servidor de http envió una cabecera de Content-Range inválida"
 
 #: methods/http.cc:623
 msgid "This HTTP server has broken range support"
-msgstr "Este servidor de http tiene el soporte de alcance roto"
+msgstr "Éste servidor de http tiene el soporte de alcance roto"
 
 #: methods/http.cc:647
 msgid "Unknown date format"
@@ -1636,7 +1668,7 @@ msgstr "Error leyendo del servidor"
 
 #: methods/http.cc:1194
 msgid "Bad header data"
-msgstr "Datos de cabecera incorrectos"
+msgstr "Mala cabecera Data"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
@@ -1670,14 +1702,14 @@ msgstr "No se pudo cambiar a %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "No se encontró un archivo de réplica «%s» "
+msgstr "No se encontró un archivo de réplica «%s»"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "No se puede leer el archivo espejo «%s»"
+msgstr "No se encontró un archivo de réplica «%s»"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1691,7 +1723,7 @@ msgid ""
 "to be corrupt."
 msgstr ""
 "No se pudo parchear %s con mmap y con el modo de uso de la operación de "
-"archivos - el paquete parece dañado."
+"ficheros - el paquete parece dañado."
 
 #: methods/rred.cc:496
 #, c-format
@@ -1736,15 +1768,15 @@ msgstr "van a configurarse. Esto puede dar lugar a errores duplicados"
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
-"o errores causados por dependencias no presentes. Esto está BIEN, solo los "
+"o errores causados por dependencias no presentes. Esto está BIEN, sólo los "
 "errores"
 
 #: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
-"encima de este mensaje son importantes. Corríjalas y ejecute «[I]nstall» "
-"otra vez"
+"encima de este mensaje son importantes. Por favor, corríjalas y ejecute «[I]"
+"nstall» otra vez"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1855,45 +1887,45 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "Uso: apt-ftparchive [opciones] orden\n"
-"Órdenes: packages ruta-binaria [archivo-predominio\n"
+"Comandos: packages ruta-binaria [archivo-predominio\n"
 "                                      [prefijo-ruta]]\n"
-"          sources ruta-origen [archivo-predominio \n"
+"          sources ruta-fuente [archivo-predominio \n"
 "                                     [prefijo-ruta]]\n"
 "          contents ruta\n"
 "          release ruta\n"
 "          generate config [grupos]\n"
 "          clean config\n"
 "\n"
-"apt-ftparchive genera índices para archivos de Debian. Permite\n"
+"apt-ftparchive genera índices para archivos de Debian. Soporta\n"
 "varios estilos de generación de reemplazos desde los completamente\n"
 "automatizados a los funcionales para dpkg-scanpackages y dpkg-scansources.\n"
 "\n"
-"apt-ftparchive genera archivos Package de un árbol de .debs. El archivo\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 puede usar\n"
 "un archivo de predominio para forzar el valor de Priority y\n"
 "Section.\n"
 "\n"
-"Igualmente, apt-ftparchive genera archivos Sources para un árbol de\n"
+"Igualmente, apt-ftparchive genera ficheros Sources para un árbol de\n"
 ".dscs. Se puede utilizar la opción --source-override para especificar un\n"
-"archivo de predominio de origen.\n"
+"fichero de predominio de fuente.\n"
 "\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 archivo\n"
+"predominio. Se añade Pathprefix a los campos de nombre de fichero\n"
 "si existen. A continuación se muestra un ejemplo de uso basado en los \n"
-"archivador de Debian:\n"
+"archivos de Debian:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
 "Opciones:\n"
 "  -h    Este texto de ayuda\n"
 "  --md5 Generación de control MD5 \n"
-"  -s=?  Archivo origen de predominio\n"
+"  -s=?  Archivo fuente de predominio\n"
 "  -q    Silencioso\n"
 "  -d=?  Selecciona la base de datos de caché opcional \n"
-"  --no-delink Activa modo de depuración delink\n"
+"  --no-delink Habilita modo de depuración delink\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"
@@ -2007,27 +2039,27 @@ msgstr " DeLink se ha llegado al límite de %sB.\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
-msgstr "El archivador no tiene campo de paquetes"
+msgstr "Archivo no tiene campo de paquetes"
 
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s no tiene entrada de predominio\n"
+msgstr " %s no tiene entrada de predominio\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  el encargado de %s es %s y no %s\n"
+msgstr " el encargado de %s es %s y no %s\n"
 
 #: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s no tiene una entrada origen predominante\n"
+msgstr " %s no tiene una entrada fuente predominante\n"
 
 #: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s tampoco tiene una entrada binaria predominante\n"
+msgstr " %s tampoco tiene una entrada binaria predominante\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -2039,19 +2071,19 @@ msgid "Unable to open %s"
 msgstr "No se pudo abrir %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Anulación incorrecta %s línea %llu #1"
+msgstr "Predominio mal formado %s línea %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Anulación incorrecta %s línea %llu #2"
+msgstr "Predominio mal formado %s línea %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Anulación incorrecta %s línea %llu #3"
+msgstr "Predominio mal formado %s línea %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -2070,7 +2102,7 @@ msgstr "Salida comprimida %s necesita una herramienta de compresión"
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
-msgstr "No se pudo crear ARCHIVO*"
+msgstr "No se pudo crear FICHERO*"
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
@@ -2096,7 +2128,7 @@ msgstr "No se pudo leer mientras se computaba MD5"
 #: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "Se produjo un problema al desvincular %s"
+msgstr "Se produjo un problema al desligar %s"
 
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
@@ -2104,6 +2136,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Falló el renombre de %s a %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -2116,6 +2149,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Uso: apt-extracttemplates archivo1 [archivo2 ...]\n"
+"\n"
+"apt-extracttemplates es una herramienta para extraer información de\n"
+"configuración y plantillas de paquetes de debian.\n"
+"\n"
+"Opciones:\n"
+"  -h   Este texto de ayuda.\n"
+"  -t   Define el directorio temporal\n"
+"  -c=? Lee este archivo de configuración\n"
+"  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::"
+"cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2141,7 +2185,7 @@ msgstr ""
 "\n"
 "Opciones:\n"
 "  -h   Este texto de ayuda.\n"
-"  -s   Utiliza ordenamiento de archivos origen\n"
+"  -s   Utiliza ordenamiento de archivos fuente\n"
 "  -c=? Lee este archivo de configuración\n"
 "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
 "cache=/tmp\n"
@@ -2152,15 +2196,16 @@ msgstr "No pude crear las tuberías"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "No pude ejecutar gzip "
+msgstr "No pude ejecutar gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
-msgstr "Archivador dañado"
+msgstr "Archivo dañado"
 
 #: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
-msgstr "Falló la suma de comprobación del tar, archivador dañado"
+msgstr ""
+"Se produjo un fallo al calcular la suma de control de tar, archive dañado"
 
 #: apt-inst/contrib/extracttar.cc:303
 #, c-format
@@ -2169,28 +2214,28 @@ msgstr "Cabecera del TAR tipo %u desconocida, miembro %s"
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
-msgstr "Firma del archivador inválida"
+msgstr "Firma del archivo inválida"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
-msgstr "Error leyendo la cabecera de miembro del archivador"
+msgstr "Error leyendo la cabecera de miembro del archivo"
 
 #: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
-msgstr "Cabecera de miembro del archivador inválida %s"
+msgstr "Cabecera de miembro del archivo inválida %s"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
-msgstr "Cabecera de miembro del archivador inválida"
+msgstr "Cabecera de miembro del archivo inválida"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
-msgstr "El archivador es muy pequeño"
+msgstr "El archivo es muy pequeño"
 
 #: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
-msgstr "No pude leer las cabeceras del archivador"
+msgstr "No pude leer las cabeceras del archivo"
 
 #: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
@@ -2288,14 +2333,13 @@ msgstr "No pude leer %s"
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Este no es un archivador DEB válido, falta el miembro «%s»"
+msgstr "Este no es un archivo DEB válido, falta el miembro «%s»"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-"Este no es un archivador DEB válido, falta el miembro «%s», «%s» o «%s»"
+msgstr "Este no es un archivo DEB válido, falta el miembro «%s», «%s» o «%s»"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2308,17 +2352,17 @@ msgstr "Archivo de control inanalizable"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
-msgstr "No puedo hacer mmap de un archivo vacío"
+msgstr "No puedo hacer mmap de un fichero vacío"
 
 #: apt-pkg/contrib/mmap.cc:111
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "No pude duplicar el descriptor de archivo %i"
+msgstr "No pude duplicar el descriptor de fichero %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "No se puede hacer mmap de %llu bytes"
+msgstr "No pude hacer mmap de %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2394,49 +2438,49 @@ msgstr "Selección %s no encontrada"
 #: apt-pkg/contrib/configuration.cc:491
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Tipo de abreviatura no reconocida: «%c»"
+msgstr "Tipo de abreviación no reconocida: «%c»"
 
 #: apt-pkg/contrib/configuration.cc:605
 #, c-format
 msgid "Opening configuration file %s"
-msgstr "Abriendo archivo de configuración %s"
+msgstr "Abriendo fichero de configuración %s"
 
 #: apt-pkg/contrib/configuration.cc:773
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Error de sintaxis %s:%u: no hay un nombre al comienzo del bloque."
+msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque."
 
 #: apt-pkg/contrib/configuration.cc:792
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Error de sintaxis %s:%u: marca mal formada"
+msgstr "Error de sintaxis %s:%u: Marca mal formada"
 
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Error de sintaxis %s:%u: basura extra después del valor"
+msgstr "Error de sintaxis %s:%u: Basura extra después del valor"
 
 #: apt-pkg/contrib/configuration.cc:849
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
-"Error de sintaxis %s:%u: las directivas solo se pueden poner en el primer "
+"Error de sintaxis %s:%u: Las directivas sólo se pueden poner en el primer "
 "nivel"
 
 #: apt-pkg/contrib/configuration.cc:856
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Error de sintaxis %s:%u: demasiadas inclusiones anidadas"
+msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas"
 
 #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Error de sintaxis %s:%u: incluido desde aquí"
+msgstr "Error de sintaxis %s:%u: Incluido desde aquí"
 
 #: apt-pkg/contrib/configuration.cc:869
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Error de sintaxis %s:%u: directiva «%s» no permitida"
+msgstr "Error de sintaxis %s:%u: Directiva «%s» no soportada"
 
 #: apt-pkg/contrib/configuration.cc:872
 #, c-format
@@ -2448,7 +2492,7 @@ msgstr ""
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Error de sintaxis %s:%u: basura extra al final del archivo"
+msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo"
 
 #: apt-pkg/contrib/progress.cc:146
 #, c-format
@@ -2485,7 +2529,7 @@ msgstr "La opción %s necesita un argumento."
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
-"Opción %s: la especificación del elemento de configuración debe tener un "
+"Opción %s: La especificación del elemento de configuración debe tener un "
 "=<val>."
 
 #: apt-pkg/contrib/cmndline.cc:237
@@ -2520,22 +2564,22 @@ msgstr "No pude montar el cdrom"
 #: apt-pkg/contrib/fileutl.cc:93
 #, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Se produjo un problema al cerrar el archivo gzip %s"
+msgstr "Se produjo un problema al cerrar el fichero gzip %s"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "No se utiliza bloqueos para el archivo de bloqueo de solo lectura %s"
+msgstr "No se utiliza bloqueos para el fichero de bloqueo de sólo lectura %s"
 
 #: apt-pkg/contrib/fileutl.cc:230
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "No se pudo abrir el archivo de bloqueo «%s»"
+msgstr "No se pudo abrir el fichero de bloqueo «%s»"
 
 #: apt-pkg/contrib/fileutl.cc:248
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "No se utilizan bloqueos para el archivo de bloqueo de montaje nfs %s"
+msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s"
 
 #: apt-pkg/contrib/fileutl.cc:252
 #, c-format
@@ -2590,12 +2634,12 @@ msgstr "El subproceso %s terminó de forma inesperada"
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
 #, c-format
 msgid "Could not open file %s"
-msgstr "No pude abrir el archivo %s"
+msgstr "No pude abrir el fichero %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
 #, c-format
 msgid "Could not open file descriptor %d"
-msgstr "No se pudo abrir el descriptor de archivo %d"
+msgstr "No se pudo abrir el descriptor de fichero %d"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2606,33 +2650,33 @@ msgid "Failed to exec compressor "
 msgstr "No se pudo ejecutar el compresor "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "leer, aun tiene %llu para leer pero no falta ninguno"
+msgstr "leídos, todavía debía leer %lu pero no queda nada"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "escribir, aun tiene %llu para escribir, pero no puede"
+msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
 msgid "Problem closing the file %s"
-msgstr "Se produjo un problema al cerrar el archivo %s"
+msgstr "Se produjo un problema al cerrar el fichero %s"
 
 #: apt-pkg/contrib/fileutl.cc:1748
 #, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Se produjo un problema al renombrar el archivo %s a %s"
+msgstr "Se produjo un problema al renombrar el fichero %s a %s"
 
 #: apt-pkg/contrib/fileutl.cc:1759
 #, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Se produjo un problema al desligar el archivo %s"
+msgstr "Se produjo un problema al desligar el fichero %s"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
-msgstr "Hay problemas sincronizando el archivo"
+msgstr "Se produjo un problema al sincronizar el fichero"
 
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
@@ -2647,13 +2691,14 @@ msgid "The package cache file is an incompatible version"
 msgstr "El archivo de caché de paquetes es una versión incompatible"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "El archivo de caché de paquete está dañado, es demasiado pequeño"
+msgstr "El archivo de caché de paquetes está dañado"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "Este APT no permite el sistema de versiones «%s»"
+msgstr "Esta versión de APT no soporta el sistema de versiones «%s»"
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
@@ -2734,12 +2779,12 @@ msgstr "Leyendo la información de estado"
 #: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr "No se pudo abrir el archivo de estado %s"
+msgstr "No se pudo abrir el fichero de estado %s"
 
 #: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "Falló la escritura del archivo de estado temporal %s"
+msgstr "Falló la escritura del fichero de estado temporal %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2838,9 +2883,9 @@ msgstr ""
 "información. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr "No se puede configurar «%s». "
+msgstr "No pude abrir el fichero «%s»"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2864,8 +2909,8 @@ msgstr "No se da soporte para el tipo de archivo de índice «%s»"
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"El paquete %s necesita ser reinstalado, pero no se encuentra un archivador "
-"para este."
+"El paquete %s necesita ser reinstalado, pero no se encuentra un archivo para "
+"éste."
 
 #: apt-pkg/algorithms.cc:1223
 msgid ""
@@ -2881,12 +2926,13 @@ msgstr ""
 "No se pudieron corregir los problemas, usted ha retenido paquetes rotos."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Algunos archivos de índice fallaron al descargar. Se han ignorado, o se han "
-"utilizado unos antiguos en su lugar"
+"No se han podido descargar algunos archivos de índice, se han ignorado, o se "
+"ha utilizado unos antiguos en su lugar."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2908,12 +2954,12 @@ msgstr "No se pudo bloquear el directorio %s"
 #: apt-pkg/acquire.cc:893
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Descargando archivo %li de %li (falta %s)"
+msgstr "Descargando fichero %li de %li (falta %s)"
 
 #: apt-pkg/acquire.cc:895
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "Descargando archivo %li de %li"
+msgstr "Descargando fichero %li de %li"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -2928,12 +2974,12 @@ msgstr "El método %s no se inició correctamente"
 #: apt-pkg/acquire-worker.cc:440
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Inserte el disco «%s» en la unidad «%s» y pulse Intro."
+msgstr "Por favor, inserte el disco «%s» en la unidad «%s» y pulse Intro."
 
 #: apt-pkg/init.cc:152
 #, c-format
 msgid "Packaging system '%s' is not supported"
-msgstr "El sistema de paquetes «%s» no está permitido"
+msgstr "No está soportado el sistema de paquetes «%s»"
 
 #: apt-pkg/init.cc:168
 msgid "Unable to determine a suitable packaging system type"
@@ -2946,7 +2992,7 @@ msgstr "No se pudo leer %s."
 
 #: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Debe poner algunos URI «origen» («source») en su sources.list"
+msgstr "Debe poner algunos URIs fuente («source») en su sources.list"
 
 #: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
@@ -3000,9 +3046,9 @@ msgstr "La caché tiene una versión incompatible de sistema de versiones"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Ocurrió un error al procesar %s (%s%d)"
+msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -3033,7 +3079,7 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:1092
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "No se puede leer la lista de paquetes origen %s"
+msgstr "No se puede leer la lista de paquetes fuente %s"
 
 #: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
 #: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
@@ -3046,7 +3092,7 @@ msgstr "Recogiendo archivos que proveen"
 
 #: apt-pkg/pkgcachegen.cc:1389 apt-pkg/pkgcachegen.cc:1396
 msgid "IO Error saving source cache"
-msgstr "Error de E/S guardando caché origen"
+msgstr "Error de E/S guardando caché fuente"
 
 #: apt-pkg/acquire-item.cc:139
 #, c-format
@@ -3072,10 +3118,9 @@ msgstr ""
 "incorrecta en sources.list o archivo mal formado)"
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
-"No se pudo encontrar la suma de comprobación para «%s» en el archivo Release"
+msgstr "No se pudo leer el archivo «Release» %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3104,7 +3149,7 @@ msgid ""
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 "Se produjo un error durante la verificación de las firmas. El repositorio no "
-"está actualizado y se utilizarán los archivos de índice antiguos. El error "
+"está actualizado y se utilizarán los ficheros de índice antiguos. El error "
 "GPG es: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
@@ -3137,8 +3182,8 @@ msgstr ""
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"Los archivos de índice de paquetes están dañados. El campo «Filename:» no "
-"existe para el paquete %s."
+"Los archivos de índice de paquetes están dañados. No existe un campo "
+"«Filename:» para el paquete %s."
 
 #: apt-pkg/acquire-item.cc:1862
 msgid "Size mismatch"
@@ -3190,7 +3235,7 @@ msgstr "Identificando.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Etiqueta guardada: %s\n"
+msgstr "Etiqueta guardada: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3258,11 +3303,11 @@ msgstr "Copiando las listas de paquetes..."
 
 #: apt-pkg/cdrom.cc:857
 msgid "Writing new source list\n"
-msgstr "Escribiendo nueva lista de origen\n"
+msgstr "Escribiendo nueva lista de fuente\n"
 
 #: apt-pkg/cdrom.cc:865
 msgid "Source list entries for this disc are:\n"
-msgstr "Las entradas de la lista de orígenes para este disco son:\n"
+msgstr "Las entradas de la lista de fuentes para este disco son:\n"
 
 #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
 #, c-format
@@ -3272,18 +3317,18 @@ msgstr "%i registros escritos.\n"
 #: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
-msgstr "%i registros escritos con %i archivo de menos.\n"
+msgstr "%i registros escritos con %i fichero de menos.\n"
 
 #: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "%i registros escritos con %i archivo mal emparejado\n"
+msgstr "%i registros escritos con %i fichero mal emparejado\n"
 
 #: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
-"%i registros escritos con %i archivo de menos y %i archivos mal emparejados\n"
+"%i registros escritos con %i fichero de menos y %i ficheros mal emparejados\n"
 
 #: apt-pkg/indexcopy.cc:515
 #, c-format
@@ -3309,7 +3354,7 @@ msgstr "No se instaló ningún anillo de claves %s."
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "No se encontró la distribución «%s» para «%s»"
+msgstr "No se encontró la Distribución «%s» para «%s»"
 
 #: apt-pkg/cacheset.cc:406
 #, c-format
@@ -3422,7 +3467,7 @@ msgstr "Falta el directorio «%s»."
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
 #, c-format
 msgid "Could not open file '%s'"
-msgstr "No pude abrir el archivo «%s»"
+msgstr "No pude abrir el fichero «%s»"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3540,8 +3585,7 @@ msgstr ""
 #: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Imposible bloquear el directorio de administración (%s), ¿es superusuario?"
+msgstr "No se encontró un archivo de réplica «%s»"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3551,172 +3595,666 @@ msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "se interrumpió la ejecución de dpkg, debe ejecutar manualmente «%s» para "
-"corregir el problema "
+"corregir el problema"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "No bloqueado"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Omitiendo el fichero inexistente %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Error de lectura de %s procesos"
+#~ msgid "Failed to remove %s"
+#~ msgstr "No pude borrar %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "No pude abrir una tubería para %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "No pude crear %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "No pude localizar un archivo de control válido"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "No pude leer %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "No pude cambiar a %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Los directorios info y temp deben de estar en el mismo sistema de archivos"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Error leyendo Md5. Desplazo %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "No pude cambiarme al directorio de administración %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Mala sección del ConfFile en el archivo de estado. Desplazo %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Error interno obteniendo un Nombre de Paquete"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "No pude encontrar un paquete: Cabecera, desplazo %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Leyendo Listado de Archivos"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "El caché del paquete debe de inicializarse primero"
+#~ 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 ""
+#~ "No pude abrir el archivo de lista «%sinfo/%s». ¡Si no puede restablecer "
+#~ "este archivo entonces cree uno vacío e inmediatamente reinstale la misma "
+#~ "versión del paquete!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Error interno agregando una desviación"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "No pude leer el archivo de lista %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Linea inválida en el archivo de desviación: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Error interno obteniendo un nodo"
 
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "No pude abrir el archivo de desviación %sdiversions"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Error interno obteniendo un nodo"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "El archive de desviaciones está dañado"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "No pude leer el archivo de lista %sinfo/%s"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Linea inválida en el archivo de desviación: %s"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Leyendo Listado de Archivos"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Error interno agregando una desviación"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Error interno obteniendo un Nombre de Paquete"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "El caché del paquete debe de inicializarse primero"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "No pude cambiarme al directorio de administración %sinfo"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "No pude encontrar un paquete: Cabecera, desplazo %lu"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Los directorios info y temp deben de estar en el mismo sistema de archivos"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Mala sección del ConfFile en el archivo de estado. Desplazo %lu"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "No pude leer %sinfo"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Error leyendo Md5. Desplazo %lu"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "No pude crear %s"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "No pude cambiar a %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "No pude borrar %s"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "No pude localizar un archivo de control válido"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Utilice «apt-get autoremove» para eliminarlos."
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "No pude abrir una tubería para %s"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Omitiendo el archivo inexistente %s"
+#~ msgid "Read error from %s process"
+#~ msgstr "Error de lectura de %s procesos"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "El paquete %s no está instalado, no se eliminará\n"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "Nota: Dpkg realiza esto de forma automática y a propósito."
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Predominio mal formado %s línea %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Predominio mal formado %s línea %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Predominio mal formado %s línea %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "leídos, todavía debía leer %lu pero no queda nada"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escritos, todavía tenía que escribir %lu pero no pude hacerlo"
+
 #~ 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!"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "No pude abrir el archivo de lista «%sinfo/%s». ¡Si no puede restablecer "
-#~ "este archivo entonces cree uno vacío e inmediatamente reinstale la misma "
-#~ "versión del paquete!"
+#~ "No se pudo realizar la configuración inmediata sobre el paquete ya "
+#~ "desempaquetado «%s». Consulte la página de manual con «man 5 apt.conf» "
+#~ "bajo «APT::Immediate-Configure» para más información."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Error interno, no pude localizar el miembro"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr ""
+#~ "Error interno, el grupo «%s» no tiene ningún pseudo-paquete instalable"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr ""
+#~ "El archivo «Release» ha expirado, ignorando %s (inválido desde hace %s)"
+
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Debe dar exactamente un patrón"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. "
+#~ "Terminando."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "No se pudo acceder al anillo de claves: «%s»"
+
+#~ msgid "Could not patch file"
+#~ msgstr "No pude parchear el fichero"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Procesando disparadores para %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "La función «Dynamic MMap» se quedó sin espacio"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "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 ""
-#~ "La asignación dinámica MMap no tiene más espacio. Por favor, incrementa "
-#~ "el valor de «APT::Cache-Limit». El valor actual es: %lu (man 5 apt.conf)"
+#~ "Como sólo solicito una única operación, es extremadamente posible que el\n"
+#~ "paquete simplemente no sea instalable y debería de rellenar un informe "
+#~ "de\n"
+#~ "error contra ese paquete."
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "El archivo de desviación esta dañado"
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Línea %d demasiado larga (máx %lu)"
+
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Línea %d demasiado larga (máx %d)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc1)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Se produjo un error mientras se procesaba %s (NewFileDesc2)"
+
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Etiqueta guardada: %s \n"
+
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "Se encontraron %i índices de paquetes, %i índices de fuentes, %i índices "
+#~ "de traducción y %i firmas\n"
+
+#~ msgid "openpty failed\n"
+#~ msgstr "Falló openpty\n"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Cambió la fecha del archivo %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Leyendo Lista de Archivos"
+
+#~ msgid "Could not execute "
+#~ msgstr "No se pudo ejecutar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparándose para eliminar con su configuración %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Eliminado con su configuración %s"
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "ID del fabricante «%s» desconocido en la línea %u de la lista de\n"
+#~ "fuentes %s"
+
+#~ 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 ""
+#~ "Se encontraron algunos paquetes rotos mientras se intentaba procesar\n"
+#~ "las dependencies de construcción. Tal vez quiera ejecutar \n"
+#~ "'apt-get -f install' para corregirlos."
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] add file1 [file1 ...]\n"
+#~ "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+#~ "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 #~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\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"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
+#~ "   add - Add an 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"
+#~ "   pkgnames - List the names of all packages\n"
+#~ "   dotty - Generate package graphs for GraphVis\n"
+#~ "   policy - Show policy settings\n"
 #~ "\n"
 #~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\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-mark(8) and apt.conf(5) manual pages for more information."
+#~ "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 #~ msgstr ""
-#~ "Uso: apt-mark [opciones] {auto|manual} paq1 [paq2 ...]\n"
+#~ "Uso: apt-cache [opciones] orden\n"
+#~ "     apt-cache [opciones] add archivo1 [archivo1 ...]\n"
+#~ "     apt-cache [opciones] showpkg paq1 [paq2 ...]\n"
 #~ "\n"
-#~ "apt-mark es una interfaz de línea de órdenes para marcar paquetes\n"
-#~ "para instalación manual o automática. También puede marcar listas.\n"
+#~ "apt-cache es una herramienta usada para manipular los archivos binarios\n"
+#~ "de caché de APT, y consultar información de éstos.\n"
 #~ "\n"
-#~ "Órdenes:\n"
-#~ "   auto - Marca los paquetes para instalación automática\n"
-#~ "   manual - Marca los paquetes para instalación manual\n"
+#~ "Comandos:\n"
+#~ "   add - Añade un archivo de paquete a la caché fuente\n"
+#~ "   gencaches - Crea el caché de ambos, del paquete y del fuente\n"
+#~ "   showpkg - Muestra alguna información general para un solo paquete\n"
+#~ "   showsrc - Muestra la información de las fuentes\n"
+#~ "   stats - Muestra algunas estadísticas básicas\n"
+#~ "   dump - Muestra el archivo entero en formato detallado\n"
+#~ "   dumpavail - Imprime un archivo de paquetes disponibles a salida\n"
+#~ "estándar\n"
+#~ "   unmet - Muestra dependencias incumplidas\n"
+#~ "   search - Busca en la lista de paquetes por un patrón de expresión\n"
+#~ "regular\n"
+#~ "   show - Muestra un registro del paquete\n"
+#~ "   depends - Muestra información de dependencias en bruto para el\n"
+#~ "paquete\n"
+#~ "   pkgnames - Lista los nombres de todos los paquetes\n"
+#~ "   dotty - Genera gráficas del paquete para GraphVis\n"
+#~ "   policy - Muestra los parámetros de las normas\n"
 #~ "\n"
 #~ "Opciones:\n"
-#~ "  -h  Este texto de ayuda.\n"
-#~ "  -q  Salida del registro. sin indicador de progreso\n"
-#~ "  -qq Sin salida excepto para errores\n"
-#~ "  -s  No-act. Solo imprime lo que se debe hacer.\n"
-#~ "  -f  marca read/write auto/manual en el archivo dado\n"
+#~ "  -h   Este texto de ayuda.\n"
+#~ "  -p=? El caché del paquete.\n"
+#~ "  -s=? El caché de la fuente.\n"
+#~ "  -q   Deshabilita el indicador de progreso.\n"
+#~ "  -i   Muestra sólo dependencias importantes para el comando de\n"
+#~ "incumplido.\n"
 #~ "  -c=? Lee este archivo de configuración\n"
-#~ "  -o=? Establece un opción de configuración arbitraria, por ejemplo -o "
-#~ "dir::cache=/tmp\n"
-#~ "Vea las páginas de manual de apt-mark(8) y apt.conf(5) para tener más "
-#~ "información."
+#~ "  -o=? Establece una opción de configuración arbitraria, p. ej. -o dir::\n"
+#~ "cache=/tmp\n"
+#~ "Consulte las páginas del manual apt-cache(8) y apt.conf(5) para más\n"
+#~ "información.\n"
+
+#~ msgid ""
+#~ "%s dependency on %s cannot be satisfied because the package %s cannot be "
+#~ "found"
+#~ msgstr ""
+#~ "La dependencia %s en %s no puede satisfacerse porque el paquete %s\n"
+#~ "no se puede encontrar"
+
+#~ msgid "The package cache was build for a different architecture"
+#~ msgstr "La caché de archivos fue creado para una arquitectura diferente"
+
+#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
+#~ msgstr ""
+#~ "Lo siento, no tiene suficiente espacio libre en %s para colocar todos "
+#~ "los .debs."
+
+#~ msgid "Sorry, but the following packages have unmet dependencies:"
+#~ msgstr ""
+#~ "Disculpe, pero los siguientes paquetes tienen dependencias incumplidas:"
+
+#~ msgid "Need to get %sB/%sB of archives. "
+#~ msgstr "Se necesitan descargar %sB/%sB de ficheros. "
+
+#~ msgid "Need to get %sB of archives. "
+#~ msgstr "Necesito descargar %sB de ficheros. "
+
+#~ msgid "After unpacking %sB will be used.\n"
+#~ msgstr "Se usarán %sB después de desempaquetar.\n"
+
+#~ msgid "After unpacking %sB will be freed.\n"
+#~ msgstr "Se liberarán %sB después de desempaquetar.\n"
+
+#~ msgid ""
+#~ "Sorry, re-installation of %s is not possible, it cannot be downloaded.\n"
+#~ msgstr ""
+#~ "Lo siento, no es posible la reinstalación del paquete %s, no puede ser "
+#~ "descargado.\n"
+
+#~ msgid "Sorry, %s is already the newest version.\n"
+#~ msgstr "Lo siento, %s ya está en su versión más reciente.\n"
+
+#~ msgid "Sorry, broken packages"
+#~ msgstr "Lo siento, paquetes rotos"
+
+#~ msgid "Sorry, you don't have enough free space in %s"
+#~ msgstr "Lo siento, no tiene suficiente espacio libre en %s"
+
+#~ msgid "Sorry, you must put some 'source' URIs in your sources.list"
+#~ msgstr "Lo siento, debe poner algunos URIs 'fuente' en su sources.list"
+
+#~ msgid "<- '"
+#~ msgstr "<- '"
+
+#~ msgid "'"
+#~ msgstr "'"
+
+#~ msgid "-> '"
+#~ msgstr "-> '"
+
+#~ msgid "Followed conf file from "
+#~ msgstr "Archivo de configuración seguido por"
+
+#~ msgid " to "
+#~ msgstr " a "
+
+#~ msgid "Extract "
+#~ msgstr "Extraer"
+
+#~ msgid "Aborted, backing out"
+#~ msgstr "Abortado, retractándome"
+
+#~ msgid "De-replaced "
+#~ msgstr "De-reemplazado"
+
+#~ msgid " from "
+#~ msgstr " de "
+
+#~ msgid "Backing out "
+#~ msgstr "Retractando "
+
+#~ msgid " [new node]"
+#~ msgstr " [nodo nuevo] "
+
+#~ msgid "Replaced file "
+#~ msgstr "Fichero reemplazado"
+
+#~ msgid "Unimplemented"
+#~ msgstr "No está implementado"
+
+#~ msgid "Generating cache"
+#~ msgstr "Generando el caché"
+
+#~ msgid "Problem with SelectFile"
+#~ msgstr "Se produjo un problema con «SelectFile»"
+
+#~ msgid "Problem with MergeList"
+#~ msgstr "Se produjo un problema con «MergeList»"
+
+#~ msgid "Regex compilation error"
+#~ msgstr "Error de compilación de Regex"
+
+#~ msgid "Write to stdout failed"
+#~ msgstr "No pude escribir a la salida estándar"
+
+#~ msgid "Generate must be enabled for this function"
+#~ msgstr "Generate debe de estar habilitado para esta función"
+
+#~ msgid "Failed to stat %s%s"
+#~ msgstr "No pude leer %s%s"
+
+#~ msgid "Failed to open %s.new"
+#~ msgstr "No pude abrir %s.new"
+
+#~ msgid "Failed to rename %s.new to %s"
+#~ msgstr "No se pudo renombrar %s.new a %s"
+
+#~ msgid "I found (binary):"
+#~ msgstr "Encontré (binario):"
+
+#~ msgid "I found (source):"
+#~ msgstr "Encontré (fuente):"
+
+#~ msgid "Found "
+#~ msgstr "Encontré "
+
+#~ msgid " source indexes."
+#~ msgstr " índice de fuentes."
+
+#~ msgid " '"
+#~ msgstr " »"
 
 #~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
+#~ "Usage: apt-cdrom [options] command\n"
 #~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\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"
-#~ "  -q  Loggable output - no progress indicator\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 arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ "See fstab(5)\n"
 #~ msgstr ""
-#~ "Uso: apt-internal-resolver\n"
+#~ "Uso: apt-cdrom [opciones] orden\n"
+#~ "\n"
+#~ "apt-cdrom es una herramienta para agregar CDROM para las fuentes de\n"
+#~ "APT. El punto de montaje del CDROM y la información del dispositivo\n"
+#~ "se extrae de apt.conf y /etc/fstab.\n"
 #~ "\n"
-#~ "apt-internal-resolver es una interfaz para usar el resolvedor interno\n"
-#~ "actual como externo para la familia APT para depuración o similar\n"
+#~ "Comandos:\n"
+#~ "   add - Agrega un CDROM\n"
+#~ "   ident - Reporta la identificación del CDROM\n"
 #~ "\n"
 #~ "Opciones:\n"
-#~ "  -h  Este texto de ayuda.\n"
-#~ "  -q  Salida registrable - sin indicador de progreso\n"
-#~ "  -c=? Lee este archivo de configuración\n"
-#~ "  -o=? Establece una opción de configuración arbitrable, -o dir::cache=/"
-#~ "tmp\n"
-#~ "apt.conf(5) páginas de manual para tener más información y opciones.\n"
-#~ "                       Este APT tiene poderes de supervaca.\n"
+#~ "  -h   Este texto de ayuda\n"
+#~ "  -d   Punto de montaje del CD-ROM\n"
+#~ "  -r   Renombra un CD-ROM reconocido\n"
+#~ "  -m   No monta\n"
+#~ "  -f   Modo rápido, no comprueba archivos de paquetes\n"
+#~ "  -a   A través de modo de búsqueda\n"
+#~ "  -c=? Lee esto archivo de configuración\n"
+#~ "  -o=? Establece una opción de configuración arbitraria, ej -o dir::\n"
+#~ "cache=/tmp\n"
+#~ "Ver fstab(5)\n"
+
+#~ msgid "Internal error, non-zero counts"
+#~ msgstr "Error interno, cuenta diferentes de cero"
+
+#~ msgid "Couldn't wait for subprocess"
+#~ msgstr "No pude esperar al subproceso"
+
+#~ msgid "....\"Have you mooed today?\"..."
+#~ msgstr "....\"¿Has mugido hoy?\"..."
+
+#~ msgid " New "
+#~ msgstr " Nuevo "
+
+#~ msgid "B "
+#~ msgstr "B "
+
+#~ msgid " files "
+#~ msgstr " archivos "
+
+#~ msgid " pkgs in "
+#~ msgstr " paquetes en "
+
+#~ 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 ""
+#~ "Uso: apt-ftparchive [opciones] orden\n"
+#~ "Comandos: packges trayectoria-binaria [archivo-sobrepaso\n"
+#~ "                                      [prefijo-trayectoria]]\n"
+#~ "          sources trayectoria-fuente [archivo-sobrepaso \n"
+#~ "                                     [prefijo-trayectoria]]\n"
+#~ "          contents trayectoria\n"
+#~ "          generate config [grupos]\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 arbitrary configuration option\n"
+#~ msgstr ""
+#~ "Opciones:\n"
+#~ "  -h    Este texto de ayuda\n"
+#~ "  --md5 Generación de control MD5 \n"
+#~ "  -s=?  Archivo fuente de predominio\n"
+#~ "  -q    Callado\n"
+#~ "  -d=?   Selecciona la base de datos opcional de cache\n"
+#~ "  --no-delink Habilita modo de depuración delink\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\n"
+
+#~ msgid "Done Packages, Starting contents."
+#~ msgstr "Paquetes terminados, empezando contenidos."
+
+#~ msgid "Hit contents update byte limit"
+#~ msgstr "Se encontró el límite de bytes de actualización de contenidos"
+
+#~ msgid "Done. "
+#~ msgstr "Listo."
+
+#~ msgid "B in "
+#~ msgstr "B en "
+
+#~ msgid " archives. Took "
+#~ msgstr " archivos. Tomo "
+
+#~ msgid "B hit."
+#~ msgstr "B Eco."
+
+#~ msgid " not "
+#~ msgstr " no "
+
+#~ msgid "DSC file '%s' is too large!"
+#~ msgstr "¡El archivo DSC «%s» es demasiado grande!"
+
+#~ msgid "Could not find a record in the DSC '%s'"
+#~ msgstr "No se pudo encontrar un registro en el archive DSC «%s»"
+
+#~ msgid "Error parsing file record"
+#~ msgstr "Error leyendo archivo de registros"
+
+#~ msgid "Failed too stat %s"
+#~ msgstr "No pude leer %s"
+
+#~ msgid "Errors apply to file '%s'"
+#~ msgstr "Los errores aplican al fichero «%s»"
+
+#~ msgid "Unkonwn address family %u (AF_*)"
+#~ msgstr "Dirección de familia %u desconocida (AF_*)"
+
+#~ msgid "Failed to mount the cdrom."
+#~ msgstr "No pude montar el cdrom"
+
+#~ msgid ""
+#~ "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 contian 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"
+#~ msgstr ""
+#~ "apt-ftparchive genera archivos de índice para archivos de Debian.\n"
+#~ "Soporta varios estilos de generación de reemplazos completamente\n"
+#~ "automatizados a funcionales para dpkg-scanpackages y dpkg-scansources\n"
+#~ "\n"
+#~ "apt-ftparchive genera archivos Package de un árbol de .debs. El Archivo\n"
+#~ "Package contiene los contenidos de todos los campos de control de cada\n"
+#~ "paquete al igual que el enlace MD5 y el tamaño del archivo. Se\n"
+#~ "soporta el uso de un archivo de predominio para forzar el valor de\n"
+#~ "Priority y Section.\n"
+#~ "\n"
+#~ "Igualmente, apt-ftparchive genera archivos de Fuentes para el árbol de\n"
+#~ ".dscs. Puede usarse la opción --source-override para especificar un\n"
+#~ "fichero de predominio fuente.\n"
+#~ "\n"
+#~ "Las órdenes 'packages' y 'sources' se deben de ejecutar en la raíz del\n"
+#~ "árbol. BinaryPath debe de apuntar a la base del archivo de búsqueda\n"
+#~ "recursiva, y el archivo de predominio debe contener banderas de\n"
+#~ "predominio. Pathprefix se agregado a los campos del nombre del archivo\n"
+#~ "si están presentes. Ejemplo de uso tomado de los archivos de Debian:\n"
+#~ "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\\\n"
+#~ "               dists/potato/main/binary-i386/Packages\n"
+
+#~ msgid "W: Unable to read directory "
+#~ msgstr "A: No se pudo leer directorio "
+
+#~ msgid "W: Unable to stat "
+#~ msgstr "A: No se pudo leer "
+
+#~ msgid "E: Errors apply to file '"
+#~ msgstr "E: Errores aplicables al archivo «"
+
+#~ msgid " DeLink limit of "
+#~ msgstr " DeLink límite de"
+
+#~ msgid " has no override entry"
+#~ msgstr " no tiene entrada de predominio"
+
+#~ msgid " maintainer is "
+#~ msgstr " el encargado es "
diff --git a/po/eu.po b/po/eu.po
index ebc6fb3e9..4bed430b8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,16 +8,15 @@ msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-08-28 19:38+0000\n"
+"PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -29,16 +28,17 @@ msgid "Total package names: "
 msgstr "Pakete Izenak Guztira : "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr "Paketearen guztizko egiturak: "
+msgstr "Pakete Izenak Guztira : "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  Pakete normalak: "
+msgstr "  Pakete normalak:"
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Pakete birtual puruak: "
+msgstr "  Pakete birtual puruak:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
@@ -86,7 +86,7 @@ msgstr "Guztira bertsio dependentzia lekua: "
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Guztira galdutako tokia: "
+msgstr "Guztira galdutako tokia:"
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -104,8 +104,9 @@ msgid "No packages found"
 msgstr "Ez da paketerik aurkitu"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "Bilatzeko elementuren bat sartu behar duzu gutxienez"
+msgstr "Zehazki eredu bat eman behar duzu."
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -149,7 +150,7 @@ msgstr "(bat ere ez)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  Paketearen pin-a: "
+msgstr "  Paketearen pin-a:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -165,6 +166,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,19 +202,55 @@ 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 ""
+"Erabilera: apt-cache [aukerak] komandoa\n"
+"           apt-cache [aukerak] add fitxategia1 [fitxategia2 ...]\n"
+"           apt-cache [aukerak] showpkg pak1 [pak2 ...]\n"
+"           apt-cache [aukerak] showsrc pak1 [pak2 ...]\n"
+"\n"
+"APTren katxe fitxategi bitarrak manipulatzeko eta kontsultatzeko erabiltzen\n"
+"den behe-mailako tresna bat da, apt-cache.\n"
+"\n"
+"Komandoak:\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"
+"   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"
+"   show - Paketearen erregistro irakurgarri bat erakusten du\n"
+"   depends - Pakete baten mendekotasunak erakusten ditu\n"
+"   pkgnames - Pakete guztien izenak zerrendatzen ditu\n"
+"   dotty - GraphViz-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 katxea.\n"
+"  -s=? Iturburuaren katxea.\n"
+"  -q   Desgaitu 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"
+"Informazio gehiago nahi izanez gero: ikus apt-cache(8) eta apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Eman disko honentzako izen bat, adibidez 'Debian 5.0.3 Disk 1'"
+msgstr ""
+"Mesedez idatzi izen bat diska honentzat, 'Debian 2.1r1 1 Diska' antzerakoan"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mesedez sar diska bat gailuan eta enter sakatu"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Errorea '%s' '%s'-n muntatzerakoan"
+msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -360,14 +398,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ez erabat instalatuta edo kenduta.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Oharra, '%s' hautatu da '%s' lanerako\n"
+msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Oharra, '%s' aukeratu da '%s' adierazpen erregularrarentzat\n"
+msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -379,8 +417,9 @@ msgid " [Installed]"
 msgstr " [Instalatuta]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr " [Ez dago bertsio bertsio hautagairik]"
+msgstr "Hautagaien bertsioak"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -402,9 +441,9 @@ msgid "However the following packages replace it:"
 msgstr "Baina ondorengo paketeek ordezten dute:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Ez dago '%s' paketearentzat instalazio hautagairik"
+msgstr "%s paketeak ez du instalatzeko hautagairik"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -413,19 +452,19 @@ msgstr "'%s bezalako pakete birtualak ezin dira ezabatu\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Oharra, '%s' aukeratu da '%s'en ordez\n"
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -433,11 +472,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s salto egin dugu, ez dago instalatuta eta eguneraketak bakarrik eskatu "
-"dira\n"
+msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -455,14 +492,14 @@ msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "'%'s (%s) bertsioa aukeratu da '%s'rentzat\n"
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -637,11 +674,7 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"Pakete hau zure sistematik desagertu egin da\n"
-"fitxategi guztiak beste pakete batek gainidatzi dituelako:"
 msgstr[1] ""
-"Pakete hauek zure sistematik desagertu egin dira\n"
-"fitxategi guztiak beste pakete batek gainidatzi dituelako:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -654,9 +687,9 @@ msgstr ""
 "Lortu ezin den '%s' helburu bertsioa saltatu egin da '%s' paketearentzat."
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "'%s' hartu da '%s'-ren ordez iturburu pakete gisa\n"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -699,28 +732,37 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] "Pakete hau automatikoki instalatu zen eta ez dugu gehiago behar:"
+msgstr[0] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
 msgstr[1] ""
-"Pakete hauek automatikoki instalatu ziren eta ez dugu gehiago behar:"
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Pakete %lu automatikoki instalatu da eta ez da gehiago behar:\n"
-msgstr[1] "%lu pakete automatikoki instalatu dira eta ez dira gehiago behar:\n"
+msgstr[0] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
+msgstr[1] ""
+"Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
+"behar."
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "'apt-get autoremove' erabili ezabatzeko."
+msgstr[1] "'apt-get autoremove' erabili ezabatzeko."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -772,9 +814,9 @@ msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s automatikoki instalatu gisa markatu da.\n"
+msgstr "%s eskuz instalatua bezala ezarri.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -920,11 +962,12 @@ msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -942,18 +985,21 @@ msgstr ""
 "paketea berriegia da"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
+"betetzen dituen %3$s paketearen bertsio erabilgarririk"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -970,15 +1016,16 @@ msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Konektatzen -> %s.(%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1023,6 +1070,46 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Erabilera: apt-get [aukerak] komandoa\n"
+"           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"
+"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"
+"   install - Instalatu pakete berriak (paketea libc6 da, eta ez libc6.deb)\n"
+"   remove - Kendu paketeak\n"
+"   autoremove - Automatikoki kendu erabiltzen ez diren paketeak\n"
+"   purge - Paketeak kendu eta garbitu\n"
+"   source - Deskargatu iturburu artxiboak\n"
+"   build-dep - Konfiguratu iturburu paketeen eraikitze dependentziak\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"
+"   check - Egiaztatu ez dagoela hautsitako mendekotasunik\n"
+"\n"
+"Aukerak:\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"
+"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"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1075,29 +1162,29 @@ msgstr ""
 "izeneko diska '%s' gailuan eta enter sakatu\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "baina ez dago instalatuta"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s eskuz instalatua bezala ezarri.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s eskuz instalatua bezala ezarri.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s bertsiorik berriena da jada.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s bertsiorik berriena da jada.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1106,14 +1193,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "%s espero zen baina ez zegoen han"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s eskuz instalatua bezala ezarri.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Huts egin du %s irekitzean"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1387,14 +1474,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Aldi baterako akatsa '%s' ebaztean"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Ezin da konektatu -> %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1406,8 +1493,9 @@ msgid "At least one invalid signature was encountered."
 msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
+msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1422,7 +1510,7 @@ msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
-"Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez baitago "
+"Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
 "eskuragarri:\n"
 
 #: methods/gzip.cc:65
@@ -1526,9 +1614,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "%s fitxategia ezin izan da ireki"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1571,12 +1659,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Deskargaturiko .deb fitxategi guztiak ezabatu nahi al dituzu?"
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Erroreak gertatu dira despaketatzerakoan. Instalatu diren paketeak"
+msgstr "Errore batzuk gertatu dira deskonprimitzean. Konfiguratu egingo ditut"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "konfiguratu egingo dira. Honek errore bikoiztuak eman ditzake"
+msgstr "instalatutako paketeak. Horrek errore bikoiztuak eragin ditzake"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1754,12 +1844,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Datu-basearen formatua ez da zuzena. apt-ren bertsio zahar batetik eguneratu "
-"baldin bazara, ezabatu eta sortu berriz datu-basea."
+"DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, "
+"mesedez datubasea ezabatu eta birsortu."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1875,19 +1966,19 @@ msgid "Unable to open %s"
 msgstr "Ezin da %s ireki"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1940,6 +2031,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1952,6 +2044,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Erabilera: apt-extracttemplates fitxategia1 [fitxategia2 ...]\n"
+"\n"
+"apt-extracttemplates debian-eko paketeen konfigurazioaren eta txantiloien\n"
+"informazioa ateratzeko tresna bat da\n"
+"\n"
+"Aukerak:\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"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2011,9 +2113,9 @@ msgid "Error reading archive member header"
 msgstr "Errorea artxiboko kidearen goiburua irakurtzean"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Artxiboko kidearen goiburua baliogabea da"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2130,7 +2232,7 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
-"Hau ez da baliozko DEB fitxategi bat, ez du  '%s', '%s' edo '%s' atalik"
+"Hau ez da baliozko DEB fitxategi bat, ez du  '%s', '%s' edo '%s' atalik "
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2146,22 +2248,24 @@ msgid "Can't mmap an empty file"
 msgstr "Ezin da fitxategi huts baten mmap egin"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Ezin izan da %lu byteren mmap egin"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Ezin da %s ireki"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Ezin da deitu "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2268,9 +2372,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2344,9 +2448,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Huts egin du CDROMa atzitzean"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Errorea %s gzip fitxategia ixtean"
+msgstr "Arazoa fitxategia ixtean"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2398,9 +2502,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "%s azpiprozesuak %u seinalea jaso du"
+msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2418,9 +2522,9 @@ msgid "Could not open file %s"
 msgstr "%s fitxategia ezin izan da ireki"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Ezin izan da %d fitxategi-deskribatzailea ireki"
+msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2431,29 +2535,29 @@ msgid "Failed to exec compressor "
 msgstr "Huts egin du konpresorea exekutatzean "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr "Errorea %s fitxategia ixtean"
+msgstr "Arazoa fitxategia ixtean"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Arazoa %s fitxategiari %s izen berria jartzean"
+msgstr "Arazoa fitxategia sinkronizatzean"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Errorea %s fitxategiaren lotura kentzean"
+msgstr "Arazoa fitxategia desestekatzean"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2472,8 +2576,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Paketeen katxe fixategiaren bertsioa ez da bateragarria"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Paketeen katxe fitxategia hondatuta dago"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2577,29 +2682,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Ezin da %s pakete fitxategia analizatu (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2654,9 +2759,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "%s fitxategia ezin izan da ireki"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2695,25 +2800,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Ezin dira arazoak konpondu; hautsitako paketeak atxiki dituzu."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 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 "
+"zaharrak erabili dira haien ordez."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "%spartial zerrenda-direktorioa falta da."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "%spartial artxibo direktorioa falta da."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Ezin da zerrenda direktorioa blokeatu"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2780,9 +2888,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2807,9 +2915,9 @@ msgstr "Katxearen bertsio sistema ez da bateragarria"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2872,9 +2980,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2936,14 +3044,14 @@ msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2951,14 +3059,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Ezin da %s pakete fitxategia analizatu (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2981,7 +3089,7 @@ msgstr "Egiaztatzen... "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Gordetako Etiketa: %s\n"
+msgstr "Gordetako Etiketa: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3026,7 +3134,7 @@ msgstr ""
 #: apt-pkg/cdrom.cc:782
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "Aurkitutako Etiketa: '%s'\n"
+msgstr "Aurkitutako Etiketa: '%s' \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3080,9 +3188,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Egiaztapena ez dator bat"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3091,9 +3199,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Abortatu instalazioa."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3106,14 +3214,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Ezin izan da %s zeregina aurkitu"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Ezin izan da %s paketea aurkitu"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3178,9 +3286,9 @@ msgid "Removing %s"
 msgstr "%s kentzen"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "%s guztiz ezabatu da"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3199,9 +3307,9 @@ msgid "Directory '%s' missing"
 msgstr "'%s' direktorioa falta da"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "%s fitxategia ezin izan da ireki"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3303,9 +3411,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Ezin da zerrenda direktorioa blokeatu"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3319,93 +3427,157 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "%s konfigurazio fitxategia irekitzen"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Irakurri errorea %s prozesutik"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Huts egin du %s kentzean"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
+#~ msgid "Unable to create %s"
+#~ msgstr "Ezin da %s sortu"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Ezin izan da baliozko kontrol fitxategi bat lokalizatu"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Huts egin du %sinfo-tik datuak lortzean"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Ezin izan da %s(e)ra aldatu"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Errorea MD5 analizatzean. Desplazamendua %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Huts egin du %sinfo administrazio direktoriora aldatzean"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Okerreko ConfFile sekzioa egoera fitxategian. Desplazamendua %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Barne errorea pakete Izen bat eskuratzerakoan"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Fitxategi zerrendaketa irakurtzen"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Paketearen katxea hasieratu behar da lehendabizi"
+#~ 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 ""
+#~ "Huts egin du '%sinfo/%s' zerrenda-fitxategia irekitzean. Fitxategi hori "
+#~ "ezin baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala "
+#~ "paketearen bertsio bera!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Barne errorea desbideratze bat gehitzean"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Huts egin du %sinfo/%s zerrenda fitxategia irakurtzean"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Lerro baliogabea desbideratze fitxategian: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Barne errorea nodo bat eskuratzerakoan"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Desbideratze fitxategia hondatuta dago"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Huts egin du desbideratzeen %sdiversions fitxategia irekitzean"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Lerro baliogabea desbideratze fitxategian: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Barne errorea nodo bat eskuratzerakoan"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Barne errorea desbideratze bat gehitzean"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Huts egin du %sinfo/%s zerrenda fitxategia irakurtzean"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Paketearen katxea hasieratu behar da lehendabizi"
 
-#~ 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 ""
-#~ "Huts egin du '%sinfo/%s' zerrenda-fitxategia irekitzean. Fitxategi hori "
-#~ "ezin baduzu leheneratu, hustu ezazu, eta berrinstalatu berehala "
-#~ "paketearen bertsio bera!"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Ezin izan da pakete bat aurkitu: Burua, mugitu %lu"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Fitxategi zerrendaketa irakurtzen"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Okerreko ConfFile sekzioa egoera fitxategian. Desplazamendua %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Barne errorea pakete Izen bat eskuratzerakoan"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Errorea MD5 analizatzean. Desplazamendua %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Huts egin du %sinfo administrazio direktoriora aldatzean"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Ezin izan da %s(e)ra aldatu"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Ezin izan da baliozko kontrol fitxategi bat lokalizatu"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Huts egin du %sinfo-tik datuak lortzean"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Ezin izan da %s(r)en kanalizazioa ireki"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Ezin da %s sortu"
+#~ msgid "Read error from %s process"
+#~ msgstr "Irakurri errorea %s prozesutik"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Huts egin du %s kentzean"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Goiburu-lerro bakarra eskuratu da %u karaktereen gainean"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "'apt-get autoremove' erabili ezabatzeko."
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gaizki osatutako override %s, lerroa: %lu #1"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gaizki osatutako override %s, lerroa: %lu #2"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. "
-#~ "Uneko balioa: %lu. (man 5 apt.conf)"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gaizki osatutako override %s, lerroa: %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "deskonpresorea"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "idatzita; oraindik %lu idazteke, baina ezin da"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Barne Errorea, ezin da atala kokatu"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Errorea gertatu da %s prozesatzean (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Ezin da eraztuna ebatzi: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Oharra: hau automatikoki egiten da eta dpkg-k proposatuta gainera."
+#~ msgid "Processing triggers for %s"
+#~ msgstr "%s-ren abiarazleak prozesatzen"
diff --git a/po/fi.po b/po/fi.po
index 02d0723b1..e24544a12 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,16 +9,14 @@ msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-15 07:09+0000\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
+"PO-Revision-Date: 2008-12-11 14:52+0200\n"
+"Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -30,8 +28,9 @@ msgid "Total package names: "
 msgstr "Pakettien kokonaismäärä : "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Pakettien kokonaismäärä : "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -105,8 +104,9 @@ msgid "No packages found"
 msgstr "Yhtään pakettia ei löytynyt"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "On annettava täsmälleen yksi lauseke"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -164,6 +164,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -199,19 +200,54 @@ 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 ""
+"Käyttö : apt-cache [valitsimet] komento\n"
+"       apt-cache [valitsimet] add tdsto1 [tdsto2 ...]\n"
+"       apt-cache [valitsimet] showpkg pkt1 [pkt2 ...]\n"
+"       apt-cache [valitsimet] showsrc pkt1 [pkt2 ...]\n"
+"\n"
+"apt-cache on alemman tason työkalu APT:n konekielisten\n"
+"välimuistitiedostojen käsittelyyn ja tutkimiseen\n"
+"Komennot:\n"
+"   add - Lisää paketti lähdevälimuistiin\n"
+"   gencaches - Tee sekä pakettivarasto että lähdevälimuisti\n"
+"   showpkg - Näytä joitain perustietoja yhdestä paketista\n"
+"   showsrc - Näytä lähdetietueet\n"
+"   stats - Näytä joitain perustilastoja\n"
+"   dump - Näytä koko tiedosto suppeassa muodossa\n"
+"   dumpavail - Tulosta saatavissa olevien luettelo oletustulosteeseen\n"
+"   unmet - Näytä tyydyttymättömät riippuvuudet\n"
+"   search - Etsi pakettiluettelosta säännöllisellä lausekkeella\n"
+"   show - Näytä paketin tietue luettavassa muodossa\n"
+"   depends - Näytä paketin riippuvuustiedot käsittelemättömässä muodossa\n"
+"   rdepends - Näytä paketin käänteiset riippuvuudet\n"
+"   pkgnames - Luettele järjestelmän kaikkien pakettien nimet\n"
+"   dotty - Tee paketeista graafit GraphViz-muodossa\n"
+"   xvcg - Tee paketeista graafit xvcg-muodossa\n"
+"   policy - Näytä mistä asennuspaketteja haetaan\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -p=? Pakettivarasto\n"
+"  -s=? Lähdevälimuisti\n"
+"  -q   Poista edistymisen ilmaisin\n"
+"  -i   Näytä vain tärkeät riippuvuudet unmet-komennossa\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+"Lisätietoja apt-cache(8) ja apt.conf(5) käsikirjasivuilla.\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Anna nimi tälle levylle, esimerkiksi 'Debian 5.0.3 levy 1'"
+msgstr "Kirjoita levylle nimi, kuten \"Debian 2.1r1 Levy 1\""
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Aseta levy asemaan ja paina Enter"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Laitteen '%s' liittäminen polkuun '%s' epäonnistui"
+msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -359,14 +395,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ei asennettu kokonaan tai poistettiin.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -378,8 +414,9 @@ msgid " [Installed]"
 msgstr " [Asennettu]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Mahdolliset versiot"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -401,9 +438,9 @@ msgid "However the following packages replace it:"
 msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Paketille ”%s” ei löydy ehdotettavia asennettavia versioita"
+msgstr "Paketilla %s ei ole asennettavaa valintaa"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -412,19 +449,19 @@ msgstr "Virtuaalipaketteja, kuten ”%s”, ei voi poistaa\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Huomautus: valitaan ”%s”-paketti paketin ”%s” sijaan\n"
+msgstr "Huomautus, valitaan %s eikä %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -432,9 +469,9 @@ 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:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -452,14 +489,14 @@ msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille ”%s”\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valittiin versio %s (%s) paketille ”%s”, koska: %s\n"
+msgstr "Valittiin versio %s (%s) paketille %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -491,7 +528,7 @@ msgstr "Tyydyttämättömiä riippuvuuksia. Koita käyttää -f."
 
 #: cmdline/apt-get.cc:1068
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "VAROITUS: Seuraavien pakettien alkuperää ei voi varmistaa!"
+msgstr "VAROITUS: Seuraavian pakettien alkuperää ei voi varmistaa!"
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
@@ -646,9 +683,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Älä välitä puuttuvasta kohdejulkaisusta '%s' paketissa '%s'"
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Valittiin '%s' lähdepaketiksi paketin '%s' sijaan\n"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -692,35 +729,37 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] ""
-"Seuraava paketti on alun perin asennettu automaattisesti, eikä sitä enää "
-"tarvita:"
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
 msgstr[1] ""
-"Seuraavat paketit on alun perin asennettu automaattisesti, eikä niitä enää "
-"tarvita:"
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] ""
-"%lu paketti on alun perin asennettu automaattisesti, eikä sitä enää "
-"tarvita.\n"
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
 msgstr[1] ""
-"%lu pakettia on alun perin asennettu automaattisesti, eikä niitä enää "
-"tarvita:\n"
+"Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
+"vaadittuja:"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Poista ne komennolla \"apt-get autoremove\"."
+msgstr[1] "Poista ne komennolla \"apt-get autoremove\"."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -771,9 +810,9 @@ msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s merkitty automaattisesti asennetuksi.\n"
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -918,11 +957,12 @@ msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -936,22 +976,25 @@ msgstr ""
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"Riippuvuutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
+"Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
 "uusi"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
+"ei vastaa versioriippuvuuksia"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -968,15 +1011,16 @@ msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Muutosloki paketille %s (%s)"
+msgstr "Avataan yhteys %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1021,6 +1065,45 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Käyttö: apt-get [valitsimet] komento\n"
+"       apt-get [valitsimet] install|remove pkt1 [pkt2 ...]\n"
+"       apt-get [valitsimet] source pkt1 [pkt2 ...]\n"
+"\n"
+"apt-get on yksinkertainen komentorivityökalu pakettien noutamiseen\n"
+"ja asentamiseen. Useimmiten käytetyt komennot ovat update ja \n"
+"install.\n"
+"Komennot:\n"
+"   update - Nouda uusi pakettiluettelo\n"
+"   upgrade - Tee päivitys\n"
+"   install - Asenna uusia paketteja (esim. libc6 eikä libc6.deb)\n"
+"   remove - Poista paketteja\n"
+"   autoremove - Poista kaikki käyttämättömät paketit\n"
+"   purge - Poista paketit asennustiedostoineen\n"
+"   source - Nouda lähdekoodiarkistoja\n"
+"   build-dep - Määritä paketointiriippuvuudet lähdekoodipaketeille\n"
+"   dist-upgrade - Koko jakelun päivitys, katso apt-get(8)\n"
+"   dselect-upgrade - Noudata dselect:n valintoja\n"
+"   clean - Poista noudetut pakettitiedostot\n"
+"   autoclean - Poista vanhat noudetut tiedostot\n"
+"   check - Tarkasta ettei ole tyydyttämättömiä riippuvuuksia\n"
+"\n"
+"Valitsimet:\n"
+"  -h  Tämä ohje\n"
+"  -q  Lokiin sopiva tulostus - edistymisen ilmaisin jätetään pois\n"
+"  -qq Ei lainkaan tulostusta paitsi virheistä\n"
+"  -d  Vain nouto - paketteja EI asenneta tai pureta\n"
+"  -s  Älä tee mitään. Oikean toiminnan simulaatio\n"
+"  -y  Vastataan Kyllä kaikkiin kysymyksiin eikä kehoitetta näytetä\n"
+"  -f  Yritä jatkaa jos eheystarkastus löysi virheen\n"
+"  -m  Yritä jatkaa jos arkistojen sijainti ei selviä\n"
+"  -u  Näytä luettelo myös päivitetyistä paketeista\n"
+"  -b  Käännä lähdekoodipaketti noudon jälkeen\n"
+"  -V  Näytä pitkät versionumerot\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
+"Katso apt-get(8), sources.list(5) ja apt.conf(5) käsikirjasivuilta\n"
+"lisätietoja ja lisää valitsimia.\n"
+"                       This APT has Super Cow Powers.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1068,29 +1151,29 @@ msgstr ""
 "asemaan \"%s\" ja paina Enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "mutta ei ole asennettu"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s on jo uusin versio.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s on jo uusin versio.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1099,14 +1182,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Odotettiin %s, mutta sitä ei ollut"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Tiedoston %s avaaminen ei onnistunut"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1325,7 +1408,7 @@ msgstr "Kysely"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "Käynnistys ei onnistu "
+msgstr "Käynnistys ei onnistu"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1340,7 +1423,7 @@ msgstr "[IP: %s %s]"
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Pistokkeen luonti ei onnistu %s (f=%u t=%u p=%u)"
+msgstr "Pistokeen luonti ei onnistu %s (f=%u t=%u p=%u)"
 
 #: methods/connect.cc:99
 #, c-format
@@ -1375,14 +1458,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Yhdistäminen kohteeseen %s ei onnistu: %s"
+msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1392,11 +1475,13 @@ msgstr ""
 
 #: methods/gpgv.cc:185
 msgid "At least one invalid signature was encountered."
-msgstr "Löytyi ainakin yksi kelvoton allekirjoitus."
+msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
+"Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1515,9 +1600,9 @@ msgstr "Peilitiedostoa \"%s\" ei löydy "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Tiedostoa %s ei voitu avata"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1560,12 +1645,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Haluatko poistaa aiemmin noudettuja .deb-tiedostoja?"
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Purkamisessa tapahtui virheitä. Paketit jotka asennettiin"
+msgstr "Tapahtui virheitä purettaessa. Tehdään asennettujen"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "säädetään. Virheet voivat näkyä tämän seurauksena kahdesti."
+msgstr "pakettien asetukset. Samat virheet voivat tulla toiseen kertaan"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1630,7 +1717,7 @@ msgstr "Paketin laajennuslista on liian pitkä"
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
-msgstr "Tapahtui virhe käsiteltäessä kansiota %s"
+msgstr "Tapahtui virhe käsiteltäessa kansiota %s"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1748,12 +1835,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "Tietokanta on vanha, yritetään päivittää %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Tietokanta on viallinen. Jos olet päivittänyt vanhemmasta apt:n versiosta, "
-"poista ja luo tietokanta uudelleen."
+"Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, "
+"on tietokanta poistettava ja luotava uudelleen."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1869,19 +1957,19 @@ msgid "Unable to open %s"
 msgstr "Tiedoston %s avaaminen ei onnistunut"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1934,6 +2022,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1946,6 +2035,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Käyttö: apt-extracttemplates tdsto1 [tdsto2 ...]\n"
+"\n"
+"apt-extracttemplates on työkalu asetus- ja mallitietojen \n"
+"poimintaan debian-paketeista\n"
+"\n"
+"Valitsimet:\n"
+"  -h   Tämä ohje\n"
+"  -t   Aseta väliaikaisten tiedostojen kansio\n"
+"  -c=? Lue tämä asetustiedosto\n"
+"  -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1981,7 +2080,7 @@ msgstr "Putkien luonti ei onnistunut"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "exec gzip ei onnistunut "
+msgstr "exec gzip ei onnistunut"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2005,9 +2104,9 @@ msgid "Error reading archive member header"
 msgstr "Tapahtui virhe luettaessa arkiston tiedoston otsikkoa"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr "Epäkelpo arkiston jäsenen otsikkotieto %s"
+msgstr "Arkiston tiedoston otsikko on virheellinen"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2141,22 +2240,24 @@ msgid "Can't mmap an empty file"
 msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Putkea %s ei voitu avata"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Ei voitu tehdä %lu tavun mmap:ia"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Tiedoston %s avaaminen ei onnistunut"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Käynnistys ei onnistu"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2261,9 +2362,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\""
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2336,9 +2437,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Komento stat ei toiminut rompulle"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Pulmia tiedoston sulkemisessa"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2387,9 +2488,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Aliprosessi %s vastaanotti signaalin %u."
+msgstr "Aliprosessi %s aiheutti suojausvirheen."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2407,9 +2508,9 @@ msgid "Could not open file %s"
 msgstr "Tiedostoa %s ei voitu avata"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Putkea %s ei voitu avata"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2417,32 +2518,32 @@ msgstr "Prosessien välistä kommunikaatiota aliprosessiin ei saatu luotua"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "Pakkaajan käynnistäminen ei onnistunut "
+msgstr "Pakkaajan käynnistäminen ei onnistunut"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Pulmia tiedoston sulkemisessa"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Pulmia tehtäessä tiedostolle sync"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Pulmia tehtäessä tiedostolle unlink"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2461,8 +2562,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Pakettivaraston versio on yhteensopimaton"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Pakettivarasto on turmeltunut"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2566,29 +2668,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Pakettitiedostoa %s (2) ei voi jäsentää"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2643,9 +2745,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Tiedostoa %s ei voitu avata"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2682,25 +2784,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Pulmia ei voi korjata, rikkinäisiä paketteja on pysytetty."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Joidenkin hakemistotiedostojen nouto ei onnistunut, ne on ohitettu tai "
+"käytetty vanhoja. "
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Luettelokansio %spartial puuttuu."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Arkistokansio %spartial puuttuu."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Luettelokansiota ei voitu lukita"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2749,7 +2854,8 @@ msgstr "Tiedostossa sources.list on oltava rivejä joissa \"lähde\"-URI"
 
 #: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakettiluettelon tai tilatiedoston avaaminen tai jäsennys epäonnistui."
+msgstr ""
+"Pakettiluettelonn tai tilatiedoston avaaminen tai jäsennys epäonnistui."
 
 #: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
@@ -2767,9 +2873,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2794,9 +2900,9 @@ msgstr "Pakettivaraston versionhallintajärjestelmä ei ole yhteensopiva"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Virhe käsiteltäessä %s (%s%d)"
+msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2860,9 +2966,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2924,14 +3030,14 @@ msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Julkaisutiedoston (”Release”) %s jäsentäminen epäonnistui"
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Huomautus, valitaan %s eikä %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2939,14 +3045,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Virheellinen rivi korvautustiedostossa: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Pakettitiedostoa %s (1) ei voi jäsentää"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2969,7 +3075,7 @@ msgstr "Tunnistetaan... "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Tallennettu nimiö: %s\n"
+msgstr "Tallennettu nimio: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3069,7 +3175,7 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Kohteen %s tarkistussumma ei täsmää"
 
@@ -3080,9 +3186,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Asennus keskeytetään."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3095,14 +3201,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Tehtävää %s ei löytynyt"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Pakettia %s ei löytynyt"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3167,9 +3273,9 @@ msgid "Removing %s"
 msgstr "Poistetaan %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr "Poistetaan kokonaan %s"
+msgstr "%s poistettiin kokonaan"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3188,9 +3294,9 @@ msgid "Directory '%s' missing"
 msgstr "Kansio \"%s\" puuttuu."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr "Tiedostoa ”%s” ei voi avata"
+msgstr "Tiedostoa %s ei voitu avata"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3292,9 +3398,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Luettelokansiota ei voitu lukita"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3308,83 +3414,162 @@ msgstr ""
 msgid "Not locked"
 msgstr "Ei lukittu"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Avataan asetustiedosto %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Prosessi %s ilmoitti lukuvirheestä"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Tiedoston %s poistaminen ei onnistunut"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Putkea %s ei voitu avata"
+#~ msgid "Unable to create %s"
+#~ msgstr "Tiedostoa %s ei voi luoda"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Kelvollista ohjaustiedostoa ei löydy"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "stat ei toimi: %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Kansioon %s vaihto ei onnistunut"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Virheellinen ConfFile-lohko tilatiedostossa. Kohta %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Paketin otsikkoa ei löydy, kohta %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Luetaan tiedostoluetteloa"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Pakettivarasto on ensin alustettava"
+#~ 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 ""
+#~ "Luettelotiedoston \"%sinfo/%s\" avaaminen ei onnistunut. Jos tätä "
+#~ "tiedostoa ei voi palauttaa, tyhjennä tiedosto ja asenna välittömästi "
+#~ "paketin sama versio uudelleen!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Tapahtui virhe luettelotiedostoa %sinfo/%s luettaessa"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Virheellinen rivi korvautustiedostossa: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Tapahtui sisäinen virhe varattaessa tiedostosolmua"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Tapahtui virhe avattaessa korvautustiedostoa %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Korvautustiedosto on turmeltunut"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Tapahtui virhe avattaessa korvautustiedostoa %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Virheellinen rivi korvautustiedostossa: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Tapahtui sisäinen virhe varattaessa tiedostosolmua"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Tapahtui sisäinen virhe lisättäessä korvautusta"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Tapahtui virhe luettelotiedostoa %sinfo/%s luettaessa"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Pakettivarasto on ensin alustettava"
 
-#~ 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 ""
-#~ "Luettelotiedoston \"%sinfo/%s\" avaaminen ei onnistunut. Jos tätä "
-#~ "tiedostoa ei voi palauttaa, tyhjennä tiedosto ja asenna välittömästi "
-#~ "paketin sama versio uudelleen!"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Paketin otsikkoa ei löydy, kohta %lu"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Luetaan tiedostoluetteloa"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Virheellinen ConfFile-lohko tilatiedostossa. Kohta %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Tapahtui sisäinen virhe haettaessa paketin nimeä"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Tapahtui virhe jäsennettäessä MD5:ttä. Kohta %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Ylläpitokansioon %sinfo vaihtaminen ei onnistunut"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Kansioon %s vaihto ei onnistunut"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Kelvollista ohjaustiedostoa ei löydy"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "stat ei toimi: %sinfo"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Putkea %s ei voitu avata"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Tiedostoa %s ei voi luoda"
+#~ msgid "Read error from %s process"
+#~ msgstr "Prosessi %s ilmoitti lukuvirheestä"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Tiedoston %s poistaminen ei onnistunut"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Vastaanotettiin yksi otsikkorivi pituudeltaan yli %u merkkiä"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Väärän muotoinen poikkeus %s rivi %lu n:ro 3"
+
+#~ msgid "decompressor"
+#~ msgstr "purkaja"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "read, vielä %lu lukematta mutta tiedosto loppui"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Tapahtui sisäinen virhe, tiedostoa ei löydy"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Tapahtui virhe käsiteltäessä %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr ""
+#~ "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Avainrengasta \"%s\" ei saatavilla"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Tiedostoa %s ei voitu avata"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Poista ne komennolla \"apt-get autoremove\"."
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Käsitellään %s:n liipaisimia"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Tila loppui kesken dynaamiselta MMap:lta"
diff --git a/po/gl.po b/po/gl.po
index b3482a773..fc5685bfe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,16 +11,15 @@ msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
+"PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 "X-Poedit-Language: Galician\n"
 
 #: cmdline/apt-cache.cc:158
@@ -169,6 +168,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -205,40 +205,40 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "Uso: apt-cache [opcións] orde\n"
-"       apt-cache [opcións] showpkg paq1 [paq2 ...]\n"
-"       apt-cache [opcións] showsrc paq1 [paq2 ...]\n"
+"       apt-cache [opcións] showpkg paquete1 [paquete2 ...]\n"
+"       apt-cache [opcións] showsrc paquete1 [paquete2 ...]\n"
 "\n"
-"apt-cache é unha ferramenta de baixo nivel usada para solicitar información\n"
-"da caché de ficheiros de binarios de APT\n"
+"apt-cache é unha ferramenta de baixo nivel usada para consultar\n"
+"informacións dos ficheiros binarios da cache do APT\n"
 "\n"
 "Ordes:\n"
-"   gencaches - Constrúe o paquete e a caché de orixe\n"
-"   showpkg - Mostra a información xeral para un paquete\n"
-"   showsrc - Mostra rexistros da orixe\n"
+"   gencaches - Constrúe as caches de paquete e fonte\n"
+"   showpkg - Mostra algunhas informacións xerais dun único paquete\n"
+"   showsrc - Mostra rexistros da fonte\n"
 "   stats - Mostra algunhas estatísticas básicas\n"
-"   dump - Mostra o ficheiro enteiro en formato breve\n"
-"   dumpavail - Imprime un ficheiro dispoñíbel na saída estándar\n"
-"   unmet - Mostra as dependencias non conseguidas\n"
-"   search - Busca unha lista de paquetes para un patrón de expresión de "
-"rexistro\n"
+"   dump - Mostra o ficheiro enteiro nun formato concreto\n"
+"   dumpavail - Imprime un ficheiro dispoñíbel para stdout\n"
+"   unmet - Mostra dependencias non atopadas\n"
+"   search - Busca na lista de paquetes por unha expresión regular\n"
 "   show - Mostra un rexistro lexíbel para o paquete\n"
-"   depends - Mostra información de dependencias en bruto para un paquete\n"
-"   rdepends - Mostra información das dependencias inversas para un paquete\n"
+"   showauto - Mostra unha lista dos paquetes instalados automaticamente\n"
+"   depends - Mostra informacións brutas de dependencia para un paquete\n"
+"   rdepends - Mostra informacións de dependencia inversa para un paquete\n"
 "   pkgnames - Lista os nomes de todos os paquetes no sistema\n"
-"   dotty - Xera gráficos de paquete para GraphViz\n"
-"   xvcg - Xera gráficos de paquete para xvcg\n"
-"   policy - Mostra a configuración da política\n"
+"   dotty - Xera gráficos de paquete para o GraphViz\n"
+"   xvcg - Xera gráficos de paquete para o xvcg\n"
+"   policy - Mostra configuracións da política\n"
 "\n"
-"Opciones:\n"
+"Options:\n"
 "  -h   Este texto de axuda.\n"
-"  -p=? A caché do paquete.\n"
-"  -s=? A caché da orixe.\n"
+"  -p=? A cache do paquete.\n"
+"  -s=? A cache da fonte.\n"
 "  -q   Desactiva o indicador de progreso.\n"
-"  -i   Mostra só as dependencias importantes para a orde non conseguida.\n"
-"  -c=? Lee este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración arbitraria, é dicir -o dir::"
-"cache=/tmp\n"
-"Vexa as páxinas do manual de apt-cache(8) e apt.conf(5) para obter máis "
+"  -i   Mostra soamente dependencias importantes para a orde unmet.\n"
+"  -c=? Ler este ficheiro de configuración\n"
+"  -o=? Define unha opción arbitraria de configuración, ex. -o dir::cache=/"
+"tmp\n"
+"Vexa a páxina de manual apt-cache(8) e apt.conf(5) para obter mais "
 "información.\n"
 
 #: cmdline/apt-cdrom.cc:79
@@ -454,14 +454,14 @@ msgstr "Non se poden retirar os paquetes virtuais como «%s»\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "O paquete %s non está instalado, así que non foi retirado\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -763,10 +763,11 @@ msgstr[1] ""
 "%lu paquetes foron instalados automaticamente e xa non son necesarios.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Empregue «apt-get autoremove» para eliminalos."
+msgstr[1] "Empregue «apt-get autoremove» para eliminalos."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -879,15 +880,15 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Empregue:\n"
-"bzr rama %s\n"
-"para recuperar as últimas (posibelmente sen publicar) actualizacións do "
+"bzr get %s\n"
+"para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
 #: cmdline/apt-get.cc:2566
@@ -973,13 +974,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"Non se pode satisfacer a dependencia %s para %s, xa que %s non está "
-"permitido en «%s» paquetes"
+"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
+"paquete %s"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -998,22 +999,22 @@ msgstr ""
 "é novo de máis"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"Non se pode satisfacer a dependencia %s para %s, xa que a versión candidata "
-"do paquete %s non satisfai os requirimentos da versión"
+"A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
+"dispoñíbel do paquete %s satisfai os requirimentos de versión"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"Non se pode satisfacer a dependencia %s para %s, xa que o paquete %s non ten "
-"versión candidata"
+"A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
+"paquete %s"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -1039,6 +1040,7 @@ msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1084,50 +1086,51 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "Uso: apt-get [opcións] orde\n"
-"       apt-get [opcións] install|remove paq1 [paq2 ...]\n"
-"       apt-get [opcións] source paq1 [paq2 ...]\n"
+"       apt-get [opcións] install|remove paquete1 [paquete2 ...]\n"
+"       apt-get [opcións] source paquete1 [paquete2 ...]\n"
 "\n"
-"apt-get é unha interface de liña de ordes sinxela para descargar\n"
-"e instalar paquetes. As ordenes máis usadas son update\n"
-"e install.\n"
+"apt-get é unha sinxela interface de liña de ordes para a descarga e\n"
+"instalación de paquetes. As ordes empregadas con máis frecuencia\n"
+"son actualizadas e instaladas. \n"
 "\n"
 "Ordes:\n"
-"   update - Obtén listas de paquetes novos\n"
-"   upgrade - Realiza unha anovación\n"
-"   install - Instala paquetes novos (paquete é libc6 non libc6.deb)\n"
-"   remove - Elimina paquetes\n"
-"   autoremove - Elimina automaticamente todos os paquetes non usados\n"
-"   purge - Elimina paquetes e ficheiros de configuración\n"
-"   source - Descarga arquivadores fonte\n"
-"   build-dep - Configura as dependencias de compilación para paquetes fonte\n"
-"   dist-upgrade - Anova a distribución, vexa apt-get(8)\n"
-"   dselect-upgrade - Segue seleccións dselect\n"
-"   clean - Limpa ficheiros de arquivadores descargados\n"
-"   autoclean - Limpa ficheiros de arquivadores descargados antigos\n"
-"   check - Verifica que no hai dependencias rotas\n"
-"   markauto - Marca os paquetes dados como instalados automaticamente\n"
-"   unmarkauto - Marca os paquetes dados como instalados manualmente\n"
-"   changelog - Descarga e mostra o rexistro de cambios do paquete dado\n"
+"   update - Recupera unha nova lista de paquetes\n"
+"   upgrade - Executa unha actualización\n"
+"   install - Instala novos paquetes (o paquete é libc6 non libc6.deb)\n"
+"   remove - Retira paquetes\n"
+"   autoremove - Retira automaticamente todos os paquetes sen uso\n"
+"   purge - Retira paquetes e ficheiros de configuración\n"
+"   source - Descarga os arquivos de fontes\n"
+"   build-dep - Configura as dependencias para paquetes de fontes\n"
+"   dist-upgrade - Actualiza a distribución, vexa apt-get(8)\n"
+"   dselect-upgrade - Segue as seleccións de dselect\n"
+"   clean - Borra os arquivos de ficheiros\n"
+"   autoclean - Borra os arquivos de ficheiros antigos\n"
+"   check - Comproba que non haxa dependencias sen cumprir\n"
+"   markauto - Marca os paquetes como instalados automaticamente\n"
+"   unmarkauto - Marca os paquetes como instalados manualmente\n"
+"   changelog - Descarga e mostra o rexistro de cambios para o paquete "
+"proposto\n"
 "   download - Descarga o paquete binario no directorio actual\n"
 "\n"
-"Opcións:\n"
-"  -h  Este texto de axuda.\n"
-"  -q  Saída rexistrábel, sen indicador de progreso\n"
-"  -qq Sen saída agás erros\n"
-"  -d  Só descarga - NON instala ou desempaqueta arquivadores\n"
-"  -s  Non actúa. Realiza unha simulación ordenada\n"
-"  -y  Asume que si a todas as peticións e non pregunta\n"
-"  -f  Tenta corrixir un sistema con dependencias rotas\n"
-"  -m  Tenta continuar se os arquivadores non son asignábeis\n"
-"  -u  Mostra unha lista de paquetes actualizados\n"
-"  -b  Compila o paquete fonte despois de obtelo\n"
-"  -V  Mostra os números de versión longos\n"
-"  -c=? Lee este ficheiro de configuración\n"
-"  -o=? Estabelece unha opción de configuración arbitraria, -o dir::cache=/"
+"Opçións:\n"
+"  -h  Este texto de axuda\n"
+"  -q  Saída rexistrábel - sen indicador de progreso\n"
+"  -qq Sen saída, agás para os erros \n"
+"  -d  Só descarga - NON instala ou desempaqueta os arquivos\n"
+"  -s  Sen acción. Fai unha simulación\n"
+"  -y  Asume Si para todas as preguntas e non as presenta\n"
+"  -f  Tenta corrixir un sistema con dependencias non cumpridas\n"
+"  -m  Tenta continuar se os arquivos non son localizados\n"
+"  -u  Mostra tamén unha lista de paquetes actualizados\n"
+"  -b  Constrúe o paquete fonte despois de descargalo\n"
+"  -V  Mostra os números detallados da versión\n"
+"  -c=? Ler este ficheiro de configuración\n"
+"  -o=? Define unha opción arbitraria de configuración, p.ex. -o dir::cache=/"
 "tmp\n"
-"Vexa as páxinas do manual de apt-get(8), sources.list(5) e apt.conf(5)\n"
-"para obter máis información e opcións.\n"
-"                       Este APT ten poderes de super vaca.\n"
+"Vexa as páxinas do manual sobre apt-get(8), sources.list(5) e apt.conf(5) \n"
+"para obter mais información e opcións\n"
+"                       Este APT ten poderes da Super Vaca.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1180,29 +1183,29 @@ msgstr ""
 "na unidade «%s» e prema Intro\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "Non se pode marcar %s xa que non está instalado.\n"
+msgstr "mais non está instalado"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "Xa se estabeleceu %s como instalado manualmente.\n"
+msgstr "%s cambiado a instalado manualmente.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "Xa se estabeleceu %s como instalado automaticamente.\n"
+msgstr "%s está estabelecido para a súa instalación automática.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s xa foi posto en espera.\n"
+msgstr "%s xa é a versión máis recente.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s xa foi retirado de en espera.\n"
+msgstr "%s xa é a versión máis recente.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1211,14 +1214,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s pór en espera.\n"
+msgstr "%s cambiado a instalado manualmente.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Cancelada a posta en espera de %s\n"
+msgstr "Non foi posíbel abrir %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1708,7 +1711,7 @@ msgstr "Mesturando a información sobre paquetes dispoñíbeis"
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s non é un paquete DEB correcto."
+msgstr "%s non é un paquete DEB válido."
 
 #: cmdline/apt-extracttemplates.cc:236
 msgid ""
@@ -1992,19 +1995,19 @@ msgid "Unable to open %s"
 msgstr "Non é posíbel puido abrir %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "«Override» %s liña %lu incorrecta (1)"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "«Override» %s liña %lu incorrecta (2)"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "«Override» %s liña %lu incorrecta (3)"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -2057,6 +2060,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Non foi posíbel cambiar o nome de %s a %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -2069,6 +2073,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Uso: apt-extracttemplates fich1 [fich2 ...]\n"
+"\n"
+"apt-extracttemplates é unha ferramenta para extraer información\n"
+"de configuración e patróns dos paquetes debian\n"
+"\n"
+"Opcións:\n"
+"  -h   Este texto de axuda\n"
+"  -t   Estabelece o directorio temporal\n"
+"  -c=? Le este ficheiro de configuración\n"
+"  -o=? Estabelece unha opción de configuración, por exemplo: -o dir::cache=/"
+"tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2269,9 +2284,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Non foi posíbel duplicar o descritor de ficheiro %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Non foi posíbel facer mmap de %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2557,14 +2572,14 @@ msgid "Failed to exec compressor "
 msgstr "Non foi posíbel executar o compresor "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "escritura, aínda hai %lu para escribir pero non se puido"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2598,8 +2613,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "O ficheiro de caché de paquetes é unha versión incompatíbel"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "O ficheiro de caché do paquete está estragado, é pequeno de máis"
+msgstr "O ficheiro de caché de paquetes está danado"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2786,9 +2802,9 @@ msgstr ""
 "baixo APT::Immediate-Configure para obter máis detalles. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Non foi posíbel abrir o ficheiro «%s»"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2827,6 +2843,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Non é posíbel solucionar os problemas, ten retidos paquetes rotos."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2947,9 +2964,9 @@ msgstr "A caché ten un sistema de versionado incompatíbel"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Produciuse un erro ao procesar %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -3501,47 +3518,9 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non está bloqueado"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Erro de lectura do proceso %s"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr ""
-#~ "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu"
-
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Empregue «apt-get autoremove» para eliminalos."
-
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Produciuse un erro interno ao obter un nome de paquete"
-
-#~ msgid "Reading file listing"
-#~ msgstr "Lendo a lista de ficheiros"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "O ficheiro de desvíos está danado"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Liña incorrecta no ficheiro de desvíos: %s"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "Produciuse un erro interno ao obter un nodo"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Produciuse un erro interno ao engadir un desvío"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Omitindo o ficheiro inexistente %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "O paquete %s non está instalado, así que non foi retirado\n"
-
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Nota: Isto será feito automaticamente por dpkg."
-
 #~ msgid "Failed to remove %s"
 #~ msgstr "Non foi posíbel retirar %s"
 
@@ -3551,9 +3530,19 @@ msgstr "Non está bloqueado"
 #~ msgid "Failed to stat %sinfo"
 #~ msgstr "Non foi posíbel atopar %sinfo"
 
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros"
+
 #~ msgid "Failed to change to the admin dir %sinfo"
 #~ msgstr "Non foi posíbel cambiar ao directorio de administración %sinfo"
 
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Produciuse un erro interno ao obter un nome de paquete"
+
+#~ msgid "Reading file listing"
+#~ msgstr "Lendo a lista de ficheiros"
+
 #~ 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 "
@@ -3565,15 +3554,31 @@ msgstr "Non está bloqueado"
 #~ msgid "Failed reading the list file %sinfo/%s"
 #~ msgstr "Non foi posíbel ler o ficheiro de listas %sinfo/%s"
 
+#~ msgid "Internal error getting a node"
+#~ msgstr "Produciuse un erro interno ao obter un nodo"
+
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Non foi posíbel abrir o ficheiro de desvíos %sdiversions"
 
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "O ficheiro de desvíos está danado"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Liña incorrecta no ficheiro de desvíos: %s"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Produciuse un erro interno ao engadir un desvío"
+
 #~ msgid "The pkg cache must be initialized first"
 #~ msgstr "Antes ten que inicializarse a caché de paquetes"
 
 #~ msgid "Failed to find a Package: header, offset %lu"
 #~ msgstr "Non foi posíbel atopar unha cabeceira Package:, desprazamento %lu"
 
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr ""
+#~ "Sección ConfFile incorrecta no ficheiro de estado. Desprazamento %lu"
+
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "Produciuse un erro ao analizar o MD5. Desprazamento %lu"
 
@@ -3586,81 +3591,82 @@ msgstr "Non está bloqueado"
 #~ msgid "Couldn't open pipe for %s"
 #~ msgstr "Non foi posíbel abrir unha canle para %s"
 
+#~ msgid "Read error from %s process"
+#~ msgstr "Erro de lectura do proceso %s"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "Obtivose unha soa liña de cabeceira en %u caracteres"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
-#~ "Limit. O valor actual é : %lu. (man 5 apt.conf)"
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Isto será feito automaticamente por dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "«Override» %s liña %lu incorrecta (2)"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "«Override» %s liña %lu incorrecta (3)"
+
+#~ msgid "decompressor"
+#~ msgstr "descompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lectura, aínda hai %lu para ler pero non queda ningún"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escritura, aínda hai %lu para escribir pero non se puido"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Uso: apt-mark [opcións] {auto|manual} paq1 [paq2 ...]\n"
-#~ "\n"
-#~ "apt-mark é unha interface de liña de ordes para marcar paquetes\n"
-#~ "para instalación manual ou automática. Tamén pode marcar listas.\n"
-#~ "\n"
-#~ "Ordes:\n"
-#~ "   auto - Marca os paquetes para instalación automática\n"
-#~ "   manual - Marca os paquetes para instalación manual\n"
-#~ "\n"
-#~ "Opcións:\n"
-#~ "  -h  Este texto de axuda.\n"
-#~ "  -q  Saída do rexistro. sen indicador de progreso\n"
-#~ "  -qq Sen saída agás para erros\n"
-#~ "  -s  No-act. Só mostra o que se faría.\n"
-#~ "  -f  marca read/write auto/manual no ficheiro indicado\n"
-#~ "  -c=? Lee este ficheiro de configuración\n"
-#~ "  -o=? Estabelece unha opción de configuración arbitraria, por exemplo -o "
-#~ "dir::cache=/tmp\n"
-#~ "Vexa as páxinas do manual de apt-mark(8) e apt.conf(5) para obter máis "
-#~ "información."
+#~ "Non foi posíbel realizar a configuración inmediata no paquete, aínda sen "
+#~ "desempaquetar, «%s». Vexa man 5 apt.conf baixo APT::Immediate-Configure "
+#~ "para obter máis detalles."
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Produciuse un erro ao procesar %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Produciuse un erro ao procesar %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Produciuse un erro ao procesar %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Produciuse un erro ao procesar %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Produciuse un erro ao procesar %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Produciuse un erro ao procesar %s (CollectFileProvides)"
+
+#, fuzzy
+#~| msgid "Internal error, could not locate member %s"
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Produciuse un erro interno, non foi posíbel atopar o membro %s"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
 #~ msgstr ""
-#~ "Uso: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver é unha interface para usar o solucionador interno\n"
-#~ "actual como externo para a familia APT para depuración ou similar\n"
-#~ "\n"
-#~ "Opcións:\n"
-#~ "  -h  Este texto de axuda.\n"
-#~ "  -q  Salía rexistrábel - sen indicador de progreso\n"
-#~ "  -c=? Lee este ficheiro de configuración\n"
-#~ "  -o=? Estabelece unha opción de configuración arbitrable, -o dir::cache=/"
-#~ "tmp\n"
-#~ "apt.conf(5) páxinas de manual para obter máis información e opcións.\n"
-#~ "                       Este APT tee poderes de super vaca.\n"
+#~ "Caducou o ficheiro de publicación, ignorando %s (non válido desde %s)"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "\n"
diff --git a/po/hu.po b/po/hu.po
index 8d819b896..c6cb2203f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: apt trunk\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"PO-Revision-Date: 2012-06-25 17:09+0200\n"
+"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"X-Launchpad-Export-Date: 2011-12-27 15:00+0000\n"
+"X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Country: HUNGARY\n"
 "X-Poedit-Language: Hungarian\n"
 
@@ -202,8 +202,8 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "Használat: apt-cache [kapcsolók] parancs\n"
-"           apt-cache [kapcsolók] showpkg pkg1 [pkg2 …]\n"
-"           apt-cache [kapcsolók] showsrc pkg1 [pkg2 …]\n"
+"           apt-cache [kapcsolók] showpkg pkg1 [pkg2 ...]\n"
+"           apt-cache [kapcsolók] showsrc pkg1 [pkg2 ...]\n"
 "\n"
 "Az apt-cache egy alacsony szintű eszköz információk lekérdezésére\n"
 "az APT bináris gyorsítótár-fájljaiból\n"
@@ -498,7 +498,7 @@ msgstr "„%s” (%s) verzió lett kijelölve ehhez: „%s”, a(z) „%s” mia
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
-msgstr "Függőségek javítása…"
+msgstr "Függőségek javítása..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
@@ -822,7 +822,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Frissítés kiszámítása… "
+msgstr "Frissítés kiszámítása... "
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -1075,8 +1075,8 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 "Használat: apt-get [kapcsolók] parancs\n"
-"           apt-get [kapcsolók] install|remove pkg1 [pkg2 …]\n"
-"           apt-get [kapcsolók] source pkg1 [pkg2 …]\n"
+"           apt-get [kapcsolók] install|remove pkg1 [pkg2 ...]\n"
+"           apt-get [kapcsolók] source pkg1 [pkg2 ...]\n"
 "\n"
 "Az apt-get egy egyszerű parancssori felület csomagok letöltéséhez és\n"
 "telepítéséhez. A leggyakrabban használt parancsok az update és az install. \n"
@@ -1728,7 +1728,7 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Használat:apt-extracttemplates fájl1 [fájl2 …]\n"
+"Használat:apt-extracttemplates fájl1 [fájl2 ...]\n"
 "\n"
 "Az apt-extracttemplates egy eszköz konfigurációs- és mintainformációk "
 "debian-\n"
@@ -2102,7 +2102,7 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 …]\n"
+"Használat: apt-sortpkgs [kapcsolók] fájl1 [fájl2 ...]\n"
 "\n"
 "Az apt-sortpkgs egy egyszerű eszköz csomagfájlok rendezésére. A -s "
 "kapcsolót\n"
@@ -2418,12 +2418,12 @@ msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén"
 #: apt-pkg/contrib/progress.cc:146
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s… Hiba!"
+msgstr "%c%s... Hiba!"
 
 #: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
-msgstr "%c%s… Kész"
+msgstr "%c%s... Kész"
 
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
@@ -2808,7 +2808,7 @@ msgstr ""
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr "A(z) „%s” beállítása sikertelen "
+msgstr "A(z) „%s” beállítása sikertelen"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -3143,7 +3143,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Azonosítás… "
+msgstr "Azonosítás... "
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
@@ -3152,7 +3152,7 @@ msgstr "Tárolt címke: %s\n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
-msgstr "CD-ROM leválasztása…\n"
+msgstr "CD-ROM leválasztása...\n"
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -3165,15 +3165,15 @@ msgstr "CD-ROM leválasztása\n"
 
 #: apt-pkg/cdrom.cc:665
 msgid "Waiting for disc...\n"
-msgstr "Várakozás a lemezre…\n"
+msgstr "Várakozás a lemezre...\n"
 
 #: apt-pkg/cdrom.cc:674
 msgid "Mounting CD-ROM...\n"
-msgstr "CD-ROM csatolása…\n"
+msgstr "CD-ROM csatolása...\n"
 
 #: apt-pkg/cdrom.cc:693
 msgid "Scanning disc for index files..\n"
-msgstr "Indexfájlok keresése a lemezen…\n"
+msgstr "Indexfájlok keresése a lemezen...\n"
 
 #: apt-pkg/cdrom.cc:744
 #, c-format
@@ -3212,7 +3212,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:830
 msgid "Copying package lists..."
-msgstr "Csomaglisták másolása…"
+msgstr "Csomaglisták másolása..."
 
 #: apt-pkg/cdrom.cc:857
 msgid "Writing new source list\n"
@@ -3505,127 +3505,17 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nincs zárolva"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Olvasási hiba %s folyamattól"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nem lehet váltani ebbe: %s"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Belső hiba egy eltérítés hozzáadásakor"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Érvénytelen sor az eltérítő fájlban: %s"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Az eltérítő fájl hibás"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Nem sikerült a(z) %sdiversions eltérítő fájlt megnyitni"
-
-#~ msgid "Reading file listing"
-#~ msgstr "Fájllista olvasása"
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "%sinfo nem érhető el"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "%s létrehozása sikertelen"
-
-#~ msgid "Failed to remove %s"
-#~ msgstr "%s eltávolítása sikertelen"
-
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "A dinamikus MMap helye elfogyott. Növelje az APT::Cache-Limit méretét. A "
-#~ "jelenlegi érték: %lu. (lásd: man 5 apt.conf)"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "A nem létező %s fájl kihagyása"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
-
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "A megadott %s csomag nincs telepítve, így nem lett törölve\n"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Ezeket az „apt-get autoremove” paranccsal törölheti."
+#~ msgid "Failed to remove %s"
+#~ msgstr "%s eltávolítása sikertelen"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Használat: apt-internal-resolver\n"
-#~ "\n"
-#~ "Az apt-internal-resolver felülettel a jelenlegi belső feloldó külső\n"
-#~ "feloldóként használható az APT családhoz hibakeresési vagy hasonló "
-#~ "céllal\n"
-#~ "\n"
-#~ "Kapcsolók:\n"
-#~ "   -h  Ez a súgó szöveg.\n"
-#~ "   -q  Naplózható kimenet - nincs folyamatjelző\n"
-#~ "   -c=? Ezt a konfigurációs fájlt olvassa be\n"
-#~ "   -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
-#~ "tmp\n"
-#~ "Lásd még az apt-get(8), sources.list(5) és apt.conf(5) kézikönyvlapokat "
-#~ "további\n"
-#~ "információkért és opciókért.\n"
-#~ "                       Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
+#~ msgid "Unable to create %s"
+#~ msgstr "%s létrehozása sikertelen"
 
-#~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
-#~ msgstr ""
-#~ "Használat: apt-mark [kapcsolók] {auto|manual} csom1 [csom2 …]\n"
-#~ "\n"
-#~ "Az apt-mark egy egyszerű parancssori felület csomagok megjelölésére\n"
-#~ "kézileg vagy automatikusan telepítettként. Képes felsorolni a jelöléseket "
-#~ "is.\n"
-#~ "\n"
-#~ "Parancsok:\n"
-#~ "   auto -Az adott csomagok megjelölése automatikusan telepítettként\n"
-#~ "   manual - Az adott csomagok megjelölése kézzel telepítettként\n"
-#~ "\n"
-#~ "Kapcsolók:\n"
-#~ "  -h  Ez a súgó szöveg.\n"
-#~ "  -q  Naplózható kimenet - nincs folyamatjelző\n"
-#~ "  -qq Nincs kimenet, kivéve a hibákat\n"
-#~ "  -s  Szimulációs mód. Csak kiírja, mi történne.\n"
-#~ "  -f  auto/kézi megjelölés olvasása/írása az adott fájlból/fájlba\n"
-#~ "  -c=? Ezt a konfigurációs fájlt olvassa be\n"
-#~ "  -o=? Beállít egy tetszőleges konfigurációs opciót, pl. -o dir::cache=/"
-#~ "tmp\n"
-#~ "Lásd még az apt-mark(8) és apt.conf(5) kézikönyvlapokat további\n"
-#~ "információkért."
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "%sinfo nem érhető el"
 
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr "Az info és temp könyvtáraknak azonos fájlrendszeren kell lenniük"
@@ -3636,6 +3526,9 @@ msgstr "Nincs zárolva"
 #~ msgid "Internal error getting a package name"
 #~ msgstr "Belső hiba a csomagnév lekérésekor"
 
+#~ msgid "Reading file listing"
+#~ msgstr "Fájllista olvasása"
+
 #~ 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 "
@@ -3651,6 +3544,18 @@ msgstr "Nincs zárolva"
 #~ msgid "Internal error getting a node"
 #~ msgstr "Belső hiba a csomópont lekérésekor"
 
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Nem sikerült a(z) %sdiversions eltérítő fájlt megnyitni"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Az eltérítő fájl hibás"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Érvénytelen sor az eltérítő fájlban: %s"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Belső hiba egy eltérítés hozzáadásakor"
+
 #~ msgid "The pkg cache must be initialized first"
 #~ msgstr "A csomaggyorsítótárat kell előbb előkészíteni"
 
@@ -3663,11 +3568,76 @@ msgstr "Nincs zárolva"
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "MD5 értelmezési hiba. Eltolás: %lu"
 
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Nem lehet váltani ebbe: %s"
+
 #~ msgid "Failed to locate a valid control file"
 #~ msgstr "Nem található érvényes control fájl"
 
 #~ msgid "Couldn't open pipe for %s"
 #~ msgstr "Nem lehet adatcsatornát nyitni ehhez: %s"
 
+#~ msgid "Read error from %s process"
+#~ msgstr "Olvasási hiba %s folyamattól"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "Egyetlen fejlécsor érkezett, amely több, mint %u karakter"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Megjegyzés: ezt a dpkg automatikusan és szándékosan hajtja végre."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Deformált felülbírálás %s %lu. sorában #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Deformált felülbírálás %s %lu. sorában #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Deformált felülbírálás %s %lu. sorában #3"
+
+#~ msgid "decompressor"
+#~ msgstr "kicsomagoló"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "olvasás, még kellene %lu, de már az összes elfogyott"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "írás, még kiírandó %lu, de ez nem lehetséges"
+
+#~ msgid ""
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
+#~ msgstr ""
+#~ "Nem lehetett a már kicsomagolt „%s” közvetlen beállítását végrehajtani. A "
+#~ "részletekért lásd a man 5 apt.conf oldalt az APT::Immediate-Configure "
+#~ "címszó alatt."
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Hiba történt a(z) %s (NewVersion%d) feldolgozása során"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Hiba történt %s feldolgozásakor (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Hiba történt %s feldolgozásakor (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)"
diff --git a/po/it.po b/po/it.po
index 89c349333..4ba3e88c5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,16 +9,16 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
-"Last-Translator: Milo Casagrande <milo.casagrande@gmail.com>\n"
+"PO-Revision-Date: 2012-06-25 21:54+0200\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Launchpad-Export-Date: 2012-06-25 19:48+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -3565,27 +3565,15 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloccato"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Errore di lettura dal processo %s"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Impossibile aprire una pipe per %s"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Saltato il file inesistente %s"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "La cache dei pacchetti deve prima essere inizializzata"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Rimozione di %s non riuscita"
 
 #~ msgid "Unable to create %s"
 #~ msgstr "Impossibile creare %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Il pacchetto %s non è installato e quindi non è stato rimosso\n"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Usare \"apt-get autoremove\" per rimuoverli."
-
-#~ msgid "Failed to remove %s"
-#~ msgstr "Rimozione di %s non riuscita"
-
 #~ msgid "Failed to stat %sinfo"
 #~ msgstr "Esecuzione di stat su %sinfo non riuscita"
 
@@ -3619,9 +3607,18 @@ msgstr "Non bloccato"
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Apertura del file di deviazione %sdiversions non riuscita"
 
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Il file di deviazione è danneggiato"
+
 #~ msgid "Invalid line in the diversion file: %s"
 #~ msgstr "Riga non valida nel file di diversion: %s"
 
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Errore interno nell'aggiungere una deviazioni"
+
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "La cache dei pacchetti deve prima essere inizializzata"
+
 #~ msgid "Failed to find a Package: header, offset %lu"
 #~ msgstr "Impossibile trovare un Package: header, offset %lu"
 
@@ -3637,95 +3634,67 @@ msgstr "Non bloccato"
 #~ msgid "Failed to locate a valid control file"
 #~ msgstr "Impossibile localizzare un file \"control\" valido"
 
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Impossibile aprire una pipe per %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Errore di lettura dal processo %s"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "Ricevuta una singola riga header su %u caratteri"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Errore interno nell'aggiungere una deviazioni"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Override non corretto: file %s riga %lu #1"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "MMap dinamica esaurita. Aumentare la dimensione di APT::Cache-Limit. Il "
-#~ "valore attuale è: %lu (man 5 apt.conf)."
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Override non corretto: file %s riga %lu #2"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Saltato il file inesistente %s"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Override non corretto: file %s riga %lu #3"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Nota: questo viene svolto automaticamente da dpkg."
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lettura, c'erano ancora %lu da leggere ma non ne è rimasto alcuno"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Il file di deviazione è danneggiato"
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Uso: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver è un'interfaccia per l'utilizzo del resolver "
-#~ "interno\n"
-#~ "come resolver esterno per il debugging degli strumenti APT\n"
-#~ "\n"
-#~ "Opzioni:\n"
-#~ "  -h   Mostra questo aiuto\n"
-#~ "  -q   Output registrabile, nessun indicatore di avanzamento\n"
-#~ "  -c=? Legge come configurazione il file specificato\n"
-#~ "  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tmp\n"
-#~ "Per maggiori informazioni e opzioni, consultare la pagina di manuale \n"
-#~ "apt.conf(5).\n"
-#~ "                       Questo APT ha i poteri della Super Mucca.\n"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (CollectFileProvides)"
+
+#~ msgid "decompressor"
+#~ msgstr "de-compressore"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Uso: apt-mark [OPZIONI] {auto|manual} PKG1 [PKG2 ...]\n"
-#~ "\n"
-#~ "apt-mark è una semplice interfaccia a riga di comando per segnalare i "
-#~ "pacchetti\n"
-#~ "come installati manualmente o automaticamente. Può anche elencare le \n"
-#~ "segnalazioni.\n"
-#~ "\n"
-#~ "Comandi:\n"
-#~ "   auto     Segna i pacchetti forniti come installati automaticamente\n"
-#~ "   manual   Segna i pacchetti forniti come installati manualmente\n"
-#~ "\n"
-#~ "Opzioni:\n"
-#~ "  -h   Mostra questo aiuto\n"
-#~ "  -q   Output registrabile, nessun indicatore di avanzamento\n"
-#~ "  -qq  Nessun output eccetto gli errori\n"
-#~ "  -s   Nessuna azione, stampa solamente cosa verrebbe fatto\n"
-#~ "  -f   Legge/Scrivere la segnalazione nel file fornito\n"
-#~ "  -c=? Legge come configurazione il file specificato\n"
-#~ "  -o=? Imposta un'opzione di configurazione, es. -o dir::cache=/tm\n"
-#~ "Per maggiori informazioni, consultare le pagine di manuale apt-mark(8) e\n"
-#~ "apt.conf(5)."
+#~ "Impossibile eseguire immediatamente la configurazione su \"%s\" già "
+#~ "estratto. Per maggiori informazioni, consultare \"man 5 apt.conf\" alla "
+#~ "sezione \"APT::Immediate-Configure\"."
diff --git a/po/ja.po b/po/ja.po
index 09ba770d4..bacc1652c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,16 +9,14 @@ msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-10-09 02:34+0000\n"
-"Last-Translator: Kentaro Kazuhama <kazken3@gmail.com>\n"
+"PO-Revision-Date: 2012-07-01 00:14+0900\n"
+"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "Language: ja\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-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Content-Transfer-Encoding: 8 bit\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -116,7 +114,7 @@ msgstr ""
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "%s のパッケージが見つかりません"
+msgstr "パッケージ %s が見つかりません"
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
@@ -129,7 +127,7 @@ msgstr "キャッシュが同期しておらず、パッケージファイルを
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
-msgstr "Pin パッケージ:"
+msgstr "Pin されたパッケージ:"
 
 #: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
@@ -240,7 +238,7 @@ msgstr "このディスクに、'Debian 5.0.3 Disk 1' のような名前を付�
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "ディスクをドライブに入れて enter を押してください"
+msgstr "ディスクをドライブに入れて Enter キーを押してください"
 
 #: cmdline/apt-cdrom.cc:129
 #, c-format
@@ -282,7 +280,7 @@ msgstr ""
 "オプション:\n"
 "  -h   このヘルプを表示する\n"
 "  -c=? 指定した設定ファイルを読み込む\n"
-"  -o=? 指定した設定オプションを適用する(例: -o dir::cache=/tmp)\n"
+"  -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n"
 
 #: cmdline/apt-get.cc:135
 msgid "Y"
@@ -371,17 +369,17 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "アップグレード: %lu 個、新規インストール: %lu 個、 "
+msgstr "アップグレード: %lu 個、新規インストール: %lu 個、"
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "再インストール: %lu 個、 "
+msgstr "再インストール: %lu 個、"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "ダウングレード: %lu 個、 "
+msgstr "ダウングレード: %lu 個、"
 
 #: cmdline/apt-get.cc:610
 #, c-format
@@ -414,7 +412,7 @@ msgstr " [インストール済み]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [候補バージョンなし]"
+msgstr "[候補バージョンなし]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -653,7 +651,7 @@ msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
-"いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
+"いくつかのアーカイブを取得できません。apt-get update を実行するか --fix-"
 "missing オプションを付けて試してみてください。"
 
 #: cmdline/apt-get.cc:1383
@@ -678,6 +676,9 @@ msgid_plural ""
 msgstr[0] ""
 "以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
 "システムから消えました:"
+msgstr[1] ""
+"以下のパッケージは、全ファイルが別のパッケージで上書きされたため、\n"
+"システムから消えました:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -742,6 +743,8 @@ msgid_plural ""
 "required:"
 msgstr[0] ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
+msgstr[1] ""
+"以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
 #: cmdline/apt-get.cc:1833
 #, c-format
@@ -751,11 +754,15 @@ msgid_plural ""
 msgstr[0] ""
 "%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ"
 "ん:\n"
+msgstr[1] ""
+"%lu つのパッケージが自動でインストールされましたが、もう必要とされていませ"
+"ん:\n"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] "これを削除するには 'apt-get autoremove' を利用してください。"
+msgstr[1] "これらを削除するには 'apt-get autoremove' を利用してください。"
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -854,7 +861,7 @@ msgstr "%s %s をダウンロードしています"
 #: cmdline/apt-get.cc:2451
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
-"ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
+"ソースを取得するには少なくとも 1 つのパッケージ名を指定する必要があります"
 
 #: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
 #, c-format
@@ -867,7 +874,7 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"注意: '%s' パッケージは以下の場所の '%s' バージョン管理システムで保守されてい"
+"注意: '%s' パッケージは以下の場所の '%s' バージョン制御システムで保守されてい"
 "ます:\n"
 "%s\n"
 
@@ -1170,7 +1177,7 @@ msgid ""
 msgstr ""
 "メディア変更: \n"
 " '%s'\n"
-"とラベルの付いたディスクをドライブ '%s' に入れて enter を押してください\n"
+"とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してください\n"
 
 #: cmdline/apt-mark.cc:55
 #, c-format
@@ -1388,7 +1395,7 @@ msgstr "パッシブソケットに接続できません。"
 
 #: methods/ftp.cc:730
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo はリスニングポートを取得することができませんでした"
+msgstr "getaddrinfo はリスニングソケットを取得できませんでした"
 
 #: methods/ftp.cc:744
 msgid "Could not bind a socket"
@@ -1449,7 +1456,7 @@ msgstr "問い合わせ"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "呼び出せません "
+msgstr "呼び出せません"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1551,19 +1558,19 @@ msgstr "不正なヘッダ行です"
 
 #: methods/http.cc:569 methods/http.cc:576
 msgid "The HTTP server sent an invalid reply header"
-msgstr "http サーバが不正なリプライヘッダを送信してきました"
+msgstr "HTTP サーバが不正なリプライヘッダを送信してきました"
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "http サーバが不正な Content-Length ヘッダを送信してきました"
+msgstr "HTTP サーバが不正な Content-Length ヘッダを送信してきました"
 
 #: methods/http.cc:621
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "http サーバが不正な Content-Range ヘッダを送信してきました"
+msgstr "HTTP サーバが不正な Content-Range ヘッダを送信してきました"
 
 #: methods/http.cc:623
 msgid "This HTTP server has broken range support"
-msgstr "http サーバのレンジサポートが壊れています"
+msgstr "HTTP サーバのレンジサポートが壊れています"
 
 #: methods/http.cc:647
 msgid "Unknown date format"
@@ -1680,7 +1687,7 @@ msgstr "不正なデフォルト設定です!"
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
 #: dselect/install:105 dselect/update:45
 msgid "Press enter to continue."
-msgstr "enter を押すと続行します。"
+msgstr "Enter キーを押すと続行します。"
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
@@ -2114,7 +2121,7 @@ msgstr "パイプの生成に失敗しました"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "gzip の実行に失敗しました "
+msgstr "gzip の実行に失敗しました"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2122,7 +2129,7 @@ msgstr "壊れたアーカイブ"
 
 #: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
-msgstr "tar チェックサムが失敗しました。アーカイブが壊れています"
+msgstr "tar チェックサム検証が失敗しました。アーカイブが壊れています"
 
 #: apt-inst/contrib/extracttar.cc:303
 #, c-format
@@ -2472,7 +2479,7 @@ msgstr "マウントポイント %s の状態を取得できません"
 
 #: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
-msgstr "cdrom の状態を取得するのに失敗しました"
+msgstr "CD-ROM の状態を取得するのに失敗しました"
 
 #: apt-pkg/contrib/fileutl.cc:93
 #, c-format
@@ -2793,7 +2800,7 @@ msgstr ""
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr "'%s' を設定できませんでした。 "
+msgstr "'%s' を設定できませんでした。"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2880,8 +2887,8 @@ msgstr "メソッド %s が正常に開始しませんでした"
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"'%s' とラベルの付いたディスクをドライブ '%s' に入れて enter を押してくださ"
-"い。"
+"'%s' とラベルの付いたディスクをドライブ '%s' に入れて Enter キーを押してくだ"
+"さい。"
 
 #: apt-pkg/init.cc:152
 #, c-format
@@ -2936,7 +2943,7 @@ msgstr ""
 #: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "pin タイプ %s が理解できませんでした"
+msgstr "pin タイプ %s を理解できませんでした"
 
 #: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
@@ -3138,7 +3145,7 @@ msgstr "確認しています.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "格納されたラベル: %s\n"
+msgstr "格納されたラベル: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3493,104 +3500,11 @@ msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "dpkg は中断されました。問題を修正するには '%s' を手動で実行する必要がありま"
-"す。 "
+"す。"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "ロックされていません"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "%u 文字を超える 1 行のヘッダを取得しました"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "%s プロセスからの読み込みエラー"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "%s に対してパイプを開けませんでした"
-
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "正しいコントロールファイルを特定できませんでした"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "%s に変更できませんでした"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "MD5 の解析エラー。オフセット %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr ""
-#~ "status ファイルに不正な ConfFile セクションがあります。オフセット %lu"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Package: ヘッダを見つけるのに失敗しました。オフセット %lu"
-
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "最初にパッケージキャッシュを初期化しなければなりません"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "内部エラー、diversion の追加"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "diversion ファイルに不正な行があります: %s"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "diversion ファイルが壊れています"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "diversions ファイル %sdiversions のオープンに失敗しました"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "内部エラー、ノードの取得"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "リストファイル %sinfo/%s の読み込みに失敗しました"
-
-#~ 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' のオープンに失敗しました。このファイルを元に戻"
-#~ "すことができないなら、その内容を空にして即座に同じバージョンのパッケージを"
-#~ "再インストールしてください!"
-
-#~ msgid "Reading file listing"
-#~ msgstr "ファイルリストを読み込んでいます"
-
-#~ msgid "Internal error getting a package name"
-#~ msgstr "パッケージ名取得中の内部エラー"
-
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "管理ディレクトリ %sinfo への移動に失敗しました"
-
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "info と temp ディレクトリは同じファイルシステム上になければなりません"
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "%sinfo の状態の取得に失敗しました"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "%s を作成できません"
-
-#~ msgid "Failed to remove %s"
-#~ msgstr "%s の削除に失敗しました"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
-
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
-
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "注意: これは dpkg により自動でわざと行われれます。"
-
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "動的 MMap が範囲を越えました。APT::Cache-Limit の大きさを増やしてくださ"
-#~ "い。現在値は %lu です (man 5 apt.conf を参照)。"
-
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "存在しないファイル %s をスキップしています"
diff --git a/po/km.po b/po/km.po
index e7e4cb9f5..b6ce8b35d 100644
--- a/po/km.po
+++ b/po/km.po
@@ -11,16 +11,14 @@ msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2011-06-29 22:44+0000\n"
+"PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
 "Language: \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-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -32,8 +30,9 @@ msgid "Total package names: "
 msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "ឈ្មោះ​កញ្ចប់​សរុប ៖ "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -60,8 +59,9 @@ msgid "Total distinct versions: "
 msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "កំណែ​ផ្សេងៗ​សរុប ៖ "
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
@@ -72,8 +72,9 @@ msgid "Total ver/file relations: "
 msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "ទំនាក់ទំនង កំណែ/ឯកសារ​សរុប ៖ "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
@@ -89,7 +90,7 @@ msgstr "ទំហំ​កំណែ​ភាព​អាស្រ័យ​សរ
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "ទំហំ slack សរុប ៖ "
+msgstr "ទំហំ slack សរុប ៖"
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -107,8 +108,9 @@ msgid "No packages found"
 msgstr "រក​កញ្ចប់​មិន​ឃើញ"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "អ្នក​ត្រូវ​តែ​ផ្ដល់​លំនាំ​មួយ​ដែល​ពិត​ប្រាកដ"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -161,11 +163,12 @@ msgstr "  តារាង​កំណែ ៖"
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,19 +204,55 @@ 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 [options] ពាក្យ​បញ្ជា\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
+"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache គឺ​ជា​ឧបករណ៍​កម្រិតទាប​​ដែល​ប្រើ​សម្រាប់​រៀបចំ​ប្រព័ន្ធ​គោល​ពីរ​របស់  APT\n"
+"ឯកសារ​ឃ្លាំង​សម្ងាត់ និង ​ព័ត៌មាន​សំណួរ​ពី​ពួក​វា\n"
+"\n"
+"ពាក្យ​បញ្ជា\n"
+"   add - បន្ថែម​ឯកសារ​កញ្ចប់​ទៅ​ឃ្លាំង​សម្ងាត់​ប្រភព\n"
+"   gencaches - បង្កើត​ទាំង​​កញ្ចប់​និង​ឃ្លាំង​សម្ងាត់​ប្រភព\n"
+"   showpkg - បង្ហាញ​ព័ត៌មាន​ទូទៅ​ខ្លះ​សម្រាប់​កញ្ចប់​តែ​មួយ\n"
+"   showsrc - បង្ហាញ​កំណត់​ត្រា​ប្រភព\n"
+"   stats - បង្ហាញ​ស្ថិតិ​មូលដ្ឋាន​ខ្លះ\n"
+"   dump - បង្ហាញ​ឯកសារ​ទាំងមូល​ក្នុង​ទ្រង់ទ្រាយ​សង្ខេប\n"
+"   dumpavail - បោះពុម្ព​ឯកសារ​ដែល​មាន​ទៅ stdout\n"
+"   unmet - បង្ហាញ​ភាពអាស្រ័យ​ unmet \n"
+"   search - ស្វែងរក​កញ្ចប់​​លំនាំ regex \n"
+"   show - បង្ហាញ​កំណត់​ត្រា​កញ្ចប់​ដែល​អាច​អាន​បាន\n"
+"   depends - បង្ហាញព័ត៌មាន​​ភាពអាស្រ័យ​កញ្ចប់​មិន​ទាន់​ច្នៃ\n"
+"   rdepends - បង្ហាញ​ព័ត៌មាន​ភាពអាស្រ័យ​កញ្ចប់​បញ្ច្រាស់​\n"
+"   pkgnames - រាយ​ឈ្មោះ​កញ្ចប់​ទាំងអស់​\n"
+"   dotty - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ GraphViz\n"
+"   xvcg - បង្កើត​កញ្ចប់​ក្រាហ្វ​សម្រាប់​ xvcg\n"
+"   policy - បង្ហាញ ការរៀបចំ​គោលការណ៍​\n"
+"\n"
+"ជម្រើស​ ៖\n"
+"  -h   នេះ​ជា​អត្ថជំនួយ​\n"
+"  -p=? ឃ្លាំងសម្ងាត់​កញ្ចប់​ ។\n"
+"  -s=? ឃ្លាំងសម្ងាត់​ប្រភព ។\n"
+"  -q   ទ្រនិច​ចង្អុល​វឌ្ឍនភាព មិន​អនុញ្ញាត​ ។\n"
+"  -i   បាន​តែ​បង្ហាញ ព័ត៌មាន​ deps ដែល​សំខាន់​សម្រាប់ពាក្យ​បញ្ជាដែល​ខុស​គ្នា  ​​​។\n"
+"  -c=? អាន​ការកំណត់​រចនាសម្ព័ន្ធ​ឯកសារ​នេះ \n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
+"មើល​ apt-cache(8) និង​ apt.conf(5) សម្រាប់​ព័ត៌មាន​បន្ថែម​​មាន​ក្នុង​ទំព័រ​សៀវភៅដៃ​ ។\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "សូម​ផ្ដល់​ឈ្មោះ​ឲ្យ​ថាស​នេះ ឧទាហរណ៍​ដូចជា 'ដេបៀន 2.1r1 ថាស​ទី ១' ជាដើម"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល"
+msgstr "សូម​បញ្ចូល​ថាស​ក្នុង​ដ្រាយ​ហើយ​ចុច​បញ្ចូល​"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -221,7 +260,7 @@ msgstr "ធ្វើដំណើរការ​នេះ​ម្តង​ទៀ
 
 #: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
-msgstr "អាគុយម៉ង់​មិន​មាន​គូ​ទេ"
+msgstr "​អាគុយម៉ង់​មិន​មាន​គូ​ទេ"
 
 #: cmdline/apt-config.cc:87
 msgid ""
@@ -271,7 +310,7 @@ msgstr "កញ្ចប់​ខាងក្រោម​មាន​ភាពអ
 #: cmdline/apt-get.cc:350
 #, c-format
 msgid "but %s is installed"
-msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង"
+msgstr "ប៉ុន្តែ​ %s ត្រូវ​បាន​ដំឡើង​"
 
 #: cmdline/apt-get.cc:352
 #, c-format
@@ -280,15 +319,15 @@ msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​�
 
 #: cmdline/apt-get.cc:359
 msgid "but it is not installable"
-msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ"
+msgstr "ប៉ុន្តែ​​វា​មិន​អាច​ដំឡើង​បាន​ទេ​"
 
 #: cmdline/apt-get.cc:361
 msgid "but it is a virtual package"
-msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត"
+msgstr "ប៉ុន្តែ​​វា​ជា​កញ្ចប់​និម្មិត​"
 
 #: cmdline/apt-get.cc:364
 msgid "but it is not installed"
-msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ"
+msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
 #: cmdline/apt-get.cc:364
 msgid "but it is not going to be installed"
@@ -308,7 +347,7 @@ msgstr "កញ្ចប់​ខាងក្រោម​នឹងត្រូវ
 
 #: cmdline/apt-get.cc:446
 msgid "The following packages have been kept back:"
-msgstr "កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
+msgstr "​កញ្ចប់​ខាង​ក្រោម​ត្រូវ​បាន​យក​ត្រឡប់​មក​វិញ ៖"
 
 #: cmdline/apt-get.cc:467
 msgid "The following packages will be upgraded:"
@@ -361,14 +400,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu មិន​បាន​ដំឡើង​ ឬ យក​ចេញបានគ្រប់ជ្រុងជ្រោយ​ឡើយ​ ។\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -380,8 +419,9 @@ msgid " [Installed]"
 msgstr " [បានដំឡើង​]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "កំណែ​សាកល្បង​"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -403,9 +443,9 @@ msgid "However the following packages replace it:"
 msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -414,19 +454,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -434,9 +474,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -449,19 +489,19 @@ msgid "%s is already the newest version.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -473,11 +513,11 @@ msgstr " បាន​បរាជ័យ ។"
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
-msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ"
+msgstr "មិន​អាច​កែ​ភាព​អាស្រ័យ​បានឡើយ​"
 
 #: cmdline/apt-get.cc:1034
 msgid "Unable to minimize the upgrade set"
-msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ"
+msgstr "មិនអាច​បង្រួម​ការ​កំណត់​ភាព​ប្រសើរ​​បាន​ឡើយ​"
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
@@ -505,7 +545,7 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ�
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
-msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ"
+msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
@@ -532,7 +572,7 @@ msgstr "យី អី​ក៏​ចម្លែង​ម្លេះ.. ទំ�
 #: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។\n"
+msgstr "ត្រូវការ​​យក​ %sB/%sB នៃ​ប័ណ្ណសារ ។​\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
@@ -544,16 +584,16 @@ msgstr "ត្រូវ​ការយក​ %sB នៃ​ប័ណ្ណសា�
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​ការ​បន្ថែម​​ទំហំ​ថាស​ត្រូវ​បាន​ប្រើ ។\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
@@ -600,7 +640,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រម
 
 #: cmdline/apt-get.cc:1372
 msgid "Some files failed to download"
-msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក"
+msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
 #: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
 msgid "Download complete and in download only mode"
@@ -616,7 +656,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1383
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន"
+msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
 
 #: cmdline/apt-get.cc:1388
 msgid "Unable to correct missing packages."
@@ -646,9 +686,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -685,25 +725,27 @@ msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
+msgstr[1] "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -740,7 +782,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1993
 msgid "Broken packages"
-msgstr "កញ្ចប់​ដែល​បាន​ខូច"
+msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
 #: cmdline/apt-get.cc:2019
 msgid "The following extra packages will be installed:"
@@ -760,9 +802,9 @@ msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -780,7 +822,7 @@ msgstr "បាន​បរាជ័យ"
 
 #: cmdline/apt-get.cc:2191
 msgid "Done"
-msgstr "ធ្វើរួច"
+msgstr "ធ្វើរួច​"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
 msgid "Internal error, problem resolver broke stuff"
@@ -879,7 +921,7 @@ msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានប
 
 #: cmdline/apt-get.cc:2747
 msgid "Child process failed"
-msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ"
+msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
 #: cmdline/apt-get.cc:2766
 msgid "Must specify at least one package to check builddeps for"
@@ -903,18 +945,18 @@ msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
 #: cmdline/apt-get.cc:3026
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ"
+msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
 #: cmdline/apt-get.cc:3049
 #, c-format
@@ -922,18 +964,20 @@ msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
+"តម្រូវការ​កំណែបានឡើយ"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -950,15 +994,16 @@ msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "កំពុង​តភ្ជាប់​ទៅ​កាន់​ %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
-msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖"
+msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1003,6 +1048,44 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"របៀបប្រើ ៖ ពាក្យបញ្ជា apt-get [options]\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] ប្រភព pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get គឺជា​ចំណុចប្រទាក់​បន្ទាត់​ពាក្យបញ្ជា​សាមញ្ញ​មួយ សម្រាប់​ធ្វើការទាញយក និង\n"
+"ដំឡើង​កញ្ចប់ ។ ជាញឹកញាប់​បំផុត គឺប្រើ​ពាក្យបញ្ជា​ដើម្បី​ធ្វើឲ្យទាន់សម័យ​\n"
+"និង ដំឡើង ។\n"
+"\n"
+"ពាក្យ​បញ្ជា ៖\n"
+"   update - ទៅយក​បញ្ជី​កញ្ចប់​ថ្មី\n"
+"   upgrade - ធ្វើឲ្យប្រសើរ\n"
+"   install - ដំឡើង​កញ្ចប់​ថ្មី (pkg គឺ libc6 មិនមែន libc6.deb)\n"
+"   remove - យក​កញ្ចប់​ចេញ\n"
+"   source - ទាញយក​ប័ណ្ណសារ​ប្រភព\n"
+"   build-dep - កំណត់​រចនា​សម្ព័ន្ធ​ភាពអាស្រ័យ​ក្នុងការស្ថាបនា​សម្រាប់​កញ្ចប់​ប្រភព\n"
+"   dist-upgrade - ការចែកចាយ​ភាពល្អប្រសើរ សូមមើល apt-get(8)\n"
+"   dselect-upgrade - ដាក់ពីក្រោយ​ជម្រើស dselect\n"
+"   clean - លុប​ឯកសារប័ណ្ណសារ​ដែលបានទាញ​យក\n"
+"   autoclean - លុប​ឯកសារប័ណ្ណសារ​ដែលបានទាញយក​ចាស់\n"
+"   check - ផ្ទៀងផ្ទាត់​ថា​មិនមានភាព​អាស្រ័យ​ដែល​ខូចទេ\n"
+"\n"
+"ជម្រើស ៖\n"
+"  -h  អត្ថបទ​ជំនួយ​នេះ ៖\n"
+"  -q  ទិន្នផល​ដែល​អាច​ចុះកំណត់ហេតុបាន - មិនមាន​ទ្រនិចបង្ហាញ​ដំណើរការឡើយ\n"
+"  -qq គ្មាន​លទ្ធផល​ទេ លើកលែងតែ​កំហុស\n"
+"  -d  ទាញយកតែប៉ុណ្ណោះ - កុំដំឡើង​ ឬ ស្រាយ​ប័ណ្ណសារ\n"
+"  -s  No-act. ធ្វើការ​ក្លែង​ការរៀប​តាមលំដាប់\n"
+"  -y  សន្មត​ថា បាទ/ចាស ទៅគ្រប់តម្រូវការ ហើយកុំ​រំលឹក\n"
+"  -f  ប៉ុនប៉ង​ធ្វើការបន្ត​ ប្រសិនបើ​ការពិនិត្យ​ភាពត្រឹមត្រូវ​បរាជ័យ\n"
+"  -m  ប៉ុនប៉ង​ធ្វើការបន្ត​ ប្រសិនបើ​ប័ណ្ណសារ​មិនអាច​ដាក់ទីតាំងបាន\n"
+"  -u  បង្ហាញ​បញ្ជី​កញ្ចប់​ដែល​បានធ្វើឲ្យប្រសើរ​ផងដែរ\n"
+"  -b  ស្ថាបនា​កញ្ចប់ប្រភព បន្ទាប់ពី​ទៅប្រមូលយកវា\n"
+"  -V  បង្ហាញ​លេខកំណែ​ជា​អក្សរ\n"
+"  -c=? អាន​ឯកសារកំណត់​រចនា​សម្ព័ន្ធ​នេះ\n"
+"  -o=? កំណត់​ជម្រើស​កំណត់រចនាសម្ព័ន្ធ​តាមចិត្ត​មួយ ឧទ. -o dir::cache=/tmp\n"
+"សូមមើល apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1014,7 +1097,7 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "វាយ "
+msgstr "វាយ​"
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
@@ -1050,29 +1133,29 @@ msgstr ""
 "ក្នុង​ដ្រាយ​ '%s' ហើយ​ចុច​បញ្ចូល\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "ប៉ុន្តែ​វា​មិន​បាន​ដំឡើង​ទេ​"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1081,14 +1164,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "រង់ចាំប់​ %s ប៉ុន្តែ ​វា​មិន​នៅទីនោះ"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1127,7 +1210,7 @@ msgid ""
 "cannot be used to add new CD-ROMs"
 msgstr ""
 "សូម​ប្រើ​ apt-cdrom ដើម្បី​បង្កើត​ស៊ីឌី-រ៉ូម​នេះ​ ដែលបានរៀបចំ​តាម​ APT​ ។ apt-get ធ្វើ​ឲ្យ​ទាន់សម័យ ​មិន​"
-"ត្រូវ​បានប្រើ​ដើម្បី​បន្ថែម​ស៊ីឌី-រ៉ូមថ្មីឡើយ"
+"ត្រូវ​បានប្រើ​ដើម្បី​បន្ថែម​ស៊ីឌី-រ៉ូមថ្មីឡើយ​"
 
 #: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
@@ -1144,7 +1227,7 @@ msgstr "រក​ថាសមិ​ន​ឃើញ​ ។"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
-msgstr "រកឯកសារ​មិន​ឃើញ"
+msgstr "រកឯកសារ​មិន​ឃើញ​"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
@@ -1153,7 +1236,7 @@ msgstr "បរាជ័យ​ក្នុងការថ្លែង"
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
-msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ"
+msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
 
 #: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
@@ -1162,11 +1245,11 @@ msgstr "URI មិនត្រឹមត្រូវ​ URIS មូលដ្ឋ�
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:173
 msgid "Logging in"
-msgstr "កំពុង​ចូល"
+msgstr "កំពុង​ចូល​"
 
 #: methods/ftp.cc:179
 msgid "Unable to determine the peer name"
-msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ"
+msgstr "មិន​អាច​កំណត់ឈ្មោះដែលត្រូវបង្ហាញ​បានឡើយ​"
 
 #: methods/ftp.cc:184
 msgid "Unable to determine the local name"
@@ -1206,11 +1289,11 @@ msgstr "TYPE បានបរាជ័យ​ ម៉ាស៊ីន​បម្រ
 
 #: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
 msgid "Connection timeout"
-msgstr "អស់ពេល​ក្នុងការតភ្ជាប់"
+msgstr "អស់ពេល​ក្នុងការតភ្ជាប់​"
 
 #: methods/ftp.cc:346
 msgid "Server closed the connection"
-msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់"
+msgstr "ម៉ាស៊ីន​បម្រើ​បាន​បិទ​ការតភ្ជាប់​"
 
 #: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
 #: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
@@ -1223,7 +1306,7 @@ msgstr "ឆ្លើយតប​សតិ​បណ្តោះអាសន្ន
 
 #: methods/ftp.cc:373 methods/ftp.cc:385
 msgid "Protocol corruption"
-msgstr "ការបង្ខូច​ពិធីការ"
+msgstr "ការបង្ខូច​ពិធីការ​"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
 #: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
@@ -1237,7 +1320,7 @@ msgstr "មិន​អាច​បង្កើត​រន្ធបានឡើ
 
 #: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
-msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់"
+msgstr "មិន​អាច​តភ្ជាប់​​រន្ធទិន្នន័យ​បានឡើយ អស់​ពេល​ក្នុងការតភ្ជាប់​"
 
 #: methods/ftp.cc:713
 msgid "Could not connect passive socket."
@@ -1249,7 +1332,7 @@ msgstr "getaddrinfo មិន​អាច​​ទទួល​យក​រន្
 
 #: methods/ftp.cc:744
 msgid "Could not bind a socket"
-msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ"
+msgstr "មិន​អាច​ចងរន្ធ​បានបានឡើយ​"
 
 #: methods/ftp.cc:748
 msgid "Could not listen on the socket"
@@ -1275,7 +1358,7 @@ msgstr "EPRT បរាជ័យ​ ម៉ាស៊ីន​បម្រើ​ប
 
 #: methods/ftp.cc:826
 msgid "Data socket connect timed out"
-msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល"
+msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័បានអស់ពេល​"
 
 #: methods/ftp.cc:833
 msgid "Unable to accept connection"
@@ -1292,7 +1375,7 @@ msgstr "មិន​អាច​ទៅ​ប្រមូល​យក​ឯកស
 
 #: methods/ftp.cc:900 methods/rsh.cc:330
 msgid "Data socket timed out"
-msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល"
+msgstr "រន្ធ​ទិន្នន័យ​បាន​អស់​ពេល​"
 
 #: methods/ftp.cc:930
 #, c-format
@@ -1302,11 +1385,11 @@ msgstr "បរាជ័យក្នុងការ​ផ្ទេរ​ទិន
 #. Get the files information
 #: methods/ftp.cc:1007
 msgid "Query"
-msgstr "សំណួរ"
+msgstr "សំណួរ​"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "មិន​អាច​ហៅ "
+msgstr "មិន​អាច​ហៅ​ "
 
 #: methods/connect.cc:75
 #, c-format
@@ -1331,7 +1414,7 @@ msgstr "មិនអាច​ចាប់ផ្ដើម​ការតភ្ជ
 #: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល"
+msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កាន់​ %s:%s (%s) បានឡើយ ការ​តភ្ជាប់​បានអស់​ពេល​"
 
 #: methods/connect.cc:125
 #, c-format
@@ -1356,14 +1439,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "មិន​អាច​តភ្ជាប់​ទៅកាន់​​ %s %s ៖"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1372,11 +1455,12 @@ msgstr "កំហុស​ខាងក្នុង​ ៖ ហត្ថលេខ
 
 #: methods/gpgv.cc:185
 msgid "At least one invalid signature was encountered."
-msgstr "បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
+msgstr "​បានជួប​ប្រទះ​​​​ហត្ថលេខា​យ៉ាងហោចណាស់មួយ ដែ​លត្រឹមត្រូវ​ ។"
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
+msgstr "មិន​អាច​ប្រតិបត្តិ '%s' ដើម្បី​ផ្ទៀងផ្ទាត់​ហត្ថលេខា (តើ gpgv ត្រូវ​បាន​ដំឡើង​ឬនៅ ?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1402,7 +1486,7 @@ msgstr "កំពុង​រង់ចាំ​បឋមកថា"
 
 #: methods/http.cc:544
 msgid "Bad header line"
-msgstr "ជួរ​បឋមកថា​ខូច"
+msgstr "ជួរ​បឋមកថា​ខូច​"
 
 #: methods/http.cc:569 methods/http.cc:576
 msgid "The HTTP server sent an invalid reply header"
@@ -1410,15 +1494,15 @@ msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើប
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ"
+msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​​បឋមកថាប្រវែង​​​មាតិកា​មិនត្រឹមត្រូវ​"
 
 #: methods/http.cc:621
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ"
+msgstr "ម៉ាស៊ីន​បម្រើ​ HTTP បានផ្ញើ​បឋមកថា​ជួរ​មាតិកា​មិន​ត្រឹមត្រូវ​"
 
 #: methods/http.cc:623
 msgid "This HTTP server has broken range support"
-msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ"
+msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូច​​​ជួរ​គាំទ្រ​"
 
 #: methods/http.cc:647
 msgid "Unknown date format"
@@ -1426,11 +1510,11 @@ msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាល
 
 #: methods/http.cc:818
 msgid "Select failed"
-msgstr "ជ្រើស​បាន​បរាជ័យ"
+msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
 #: methods/http.cc:823
 msgid "Connection timed out"
-msgstr "ការតភ្ជាប់​បាន​អស់ពេល"
+msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
 #: methods/http.cc:846
 msgid "Error writing to output file"
@@ -1458,11 +1542,11 @@ msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
-msgstr "ការតភ្ជាប់​បាន​បរាជ័យ"
+msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
 #: methods/http.cc:1358
 msgid "Internal error"
-msgstr "កំហុស​ខាង​ក្នុង"
+msgstr "កំហុស​ខាង​ក្នុង​"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
@@ -1493,9 +1577,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1518,7 +1602,7 @@ msgstr ""
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង"
+msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​បំពង់​ IPC សម្រាប់​ដំណើរ​ការ​រង​"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
@@ -1538,21 +1622,23 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "កំហុ​ស​មួយ​ចំនួន​បាន​កើត​ឡើង​ខណៈពេល​ពន្លា​កញ្ចប់ ។ ខ្ញុំ​នឹង​កំណត់រចនាសម្ប័ន្ធ"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "កញ្ចប់​ដែល​បាន​ដំឡើង​ ។ នេះ​ប្រហែល​ជា​លទ្ធផល​កំហុស​ស្ទួន​"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "ឬ​ កំហុសដែលបង្ក​ដោយ​ការ​បាត់បង់​ភាពអាស្រ័យ​ ។ ​មិន​អី​ទេ​ គ្រាន់​តែ​ជា​កំហុស"
+msgstr "ឬ​ កំហុសដែលបង្ក​ដោយ​ការ​បាត់បង់​ភាពអាស្រ័យ​ ។ ​មិន​អី​ទេ​ គ្រាន់​តែ​ជា​កំហុស "
 
 #: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
-msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន់​ណាស់​ ។ សូម​ជួសជុល​ពួកវា​ ហើយ​រត់​ការដំឡើង​ម្តងទៀត"
+msgstr "នៅខាងលើ​សារ​នេះ​គឺ​សំខាន់​ណាស់​ ។ សូម​ជួសជុល​ពួកវា​ ហើយ​រត់​ការដំឡើង​ម្តងទៀត​"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1605,7 +1691,7 @@ msgstr "បញ្ជី​ផ្នែក​បន្ថែម​កញ្ចប
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
-msgstr "កំហុស​ដំណើរការ​ថត​ %s"
+msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1703,7 +1789,7 @@ msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
-msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង"
+msgstr "គ្មាន​ការ​ជ្រើស​​ដែល​ផ្គួផ្គង​"
 
 #: ftparchive/apt-ftparchive.cc:880
 #, c-format
@@ -1721,10 +1807,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "DB ចាស់​, កំពុង​ព្យាយាម​ធ្វើ​ឲ្យ %s ប្រសើរ​ឡើង"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
+"ទ្រង់ទ្រាយ​មូលដ្ឋាន​ទិន្នន័យ​មិន​ត្រឹមត្រូវ ។ ប្រសិន​បើ​អ្នក​បាន​ធ្វើ​ឲ្យ​វា​ប្រសើឡើង​ពី​កំណែ​ចាស់​របស់ apt សូម​យក​"
+"មូលដ្ឋាន​ទិន្នន័យ​ចេញ និង​បង្កើត​មូលដ្ឋាន​ទិន្នន័យ​ឡើង​វិញ ។"
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1739,11 +1828,11 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការថ្លែ
 
 #: ftparchive/cachedb.cc:249
 msgid "Archive has no control record"
-msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ"
+msgstr "ប័ណ្ណសារ​គ្មាន​កំណត់​ត្រា​ត្រួត​ពិនិត្យ​ទេ​"
 
 #: ftparchive/cachedb.cc:490
 msgid "Unable to get a cursor"
-msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច"
+msgstr "មិន​អាច​យក​ទស្សន៍ទ្រនិច​"
 
 #: ftparchive/writer.cc:80
 #, c-format
@@ -1765,7 +1854,7 @@ msgstr "W: "
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ "
+msgstr "E: កំហុស​អនុវត្ត​លើ​ឯកសារ​"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
@@ -1808,7 +1897,7 @@ msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
-msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់"
+msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
 
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
@@ -1832,7 +1921,7 @@ msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ព�
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ"
+msgstr "realloc - បរាជ័យ​ក្នុង​ការ​​បម្រុង​​ទុក​សតិ​"
 
 #: ftparchive/override.cc:35 ftparchive/override.cc:143
 #, c-format
@@ -1840,19 +1929,19 @@ msgid "Unable to open %s"
 msgstr "មិន​អាចបើក​ %s បានឡើយ"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1867,7 +1956,7 @@ msgstr "មិន​ស្គាល់​ក្បួន​ដោះស្រា
 #: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់"
+msgstr "​ទិន្នផល​ដែល​បាន​បង្ហាប់​​ %s ត្រូវ​ការ​កំណត់​ការបង្ហាប់​"
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
@@ -1875,7 +1964,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​បង្កើត​
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
-msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក"
+msgstr "បាន​បរាជ័យ​ក្នុងការ​ដាក់ជា​ពីរផ្នែក​"
 
 #: ftparchive/multicompress.cc:206
 msgid "Compress child"
@@ -1888,7 +1977,7 @@ msgstr "កំហុស​ខាងក្នុង​ បរាជ័យ​ក�
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
-msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ"
+msgstr "IO សម្រាប់​ដំណើរការ​រង​/ឯកសារ​ បាន​បរាជ័យ​"
 
 #: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
@@ -1905,6 +1994,7 @@ msgid "Failed to rename %s to %s"
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ្មោះ %s ទៅ %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1917,6 +2007,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"ការ​ប្រើប្រាស់​ ៖ apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates ជាឧបករណ៍ដើម្បី​ស្រង់​ព័ត៌មាន​ការ​រចនាសម្ព័ន្ធ​​និង​ពុម្ព​\n"
+"ពី​កញ្ចប់​​ដេបៀន \n"
+"\n"
+"ជម្រើស ៖ ​\n"
+"  -h   អត្ថបទ​ជំនួយ​\n"
+"  -t  កំណត់​ថត​បណ្ដោះ​អាសន្ន\n"
+"  -c=? អាន​ឯកសារ​ការ​កំណត់​រចនាស្ព័ន្ធ​នេះ\n"
+"  -o=? កំណត់​ជម្រើស​ការ​កំណត់​រចនា​សម្ព័ន្ធ​តាម​ចិត្ត ឧ. eg -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1948,15 +2048,15 @@ msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
-msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់"
+msgstr "បាន​បរាជ័យក្នុង​ការ​បង្កើត​បំពង់​"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip "
+msgstr "បាន​បរាជ័យក្នុង​ការ​ប្រតិបត្តិ gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
-msgstr "ប័ណ្ណសារ​បាន​ខូច"
+msgstr "ប័ណ្ណសារ​បាន​ខូច​"
 
 #: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
@@ -1969,16 +2069,16 @@ msgstr "មិន​ស្គាល់​ប្រភេទ​បឋមកថា
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
-msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ"
+msgstr "ហត្ថលេខា​ប័ណ្ណសា​រមិន​ត្រឹមត្រូវ​"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "កំហុស​ក្នុងការ​អានបឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "បឋមកថា​សមាជិក​ប័ណ្ណសារ"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2041,7 +2141,7 @@ 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
@@ -2060,7 +2160,7 @@ msgstr "ផ្លូវ​បង្វែរ វែងពេក"
 #: 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"
@@ -2088,13 +2188,13 @@ msgstr "មិន​អាច​ថ្លែង %s បានឡើយ"
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'"
+msgstr "នេះ​ជាមិនមែនជា​ប័ណ្ណសារ​ DEB ​ត្រឹមត្រូវទេ បាត់បង់សមាជិក​ '%s'​"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
+msgstr "នេះជា​ប័ណ្ណសារ DEB មិន​ត្រឹមត្រូវ វាគ្មានសមាជិក '%s' ឬ '%s'"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2110,22 +2210,24 @@ msgid "Can't mmap an empty file"
 msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "មិន​អាចបើក​ %s បានឡើយ"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "មិន​អាច​ហៅ​ "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2133,8 +2235,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2207,7 +2310,7 @@ msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ"
+msgstr "កំហុស​​វាក្យ​សម្ពន្ធ %s:%u ៖ តម្លៃ​ឥតបានការ​នៅ​ក្រៅ​"
 
 #: apt-pkg/contrib/configuration.cc:849
 #, c-format
@@ -2222,7 +2325,7 @@ msgstr "កំហុស​វាក្យសម្ពន្ធ %s:%u ៖ មា
 #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ"
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ បានរួម​បញ្ចូល​ពី​ទីនេះ​"
 
 #: apt-pkg/contrib/configuration.cc:869
 #, c-format
@@ -2230,9 +2333,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "កំហុស​វាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដី​បង្គាប់​ដែល​មិនបានគាំទ្រ '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "កំហុសវាក្យ​សម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់​អាចត្រូវបានធ្វើ​តែនៅលើ​កម្រិត​កំពូល​តែប៉ុណ្ណោះ"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2247,7 +2350,7 @@ msgstr "%c%s... កំហុស ​!"
 #: apt-pkg/contrib/progress.cc:148
 #, c-format
 msgid "%c%s... Done"
-msgstr "%c%s... ធ្វើរួច"
+msgstr "%c%s... ធ្វើរួច​"
 
 #: apt-pkg/contrib/cmndline.cc:80
 #, c-format
@@ -2305,9 +2408,9 @@ msgid "Failed to stat the cdrom"
 msgstr "បរាជ័យក្នុងការ​ថ្លែង ស៊ីឌីរ៉ូម"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2356,9 +2459,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "ដំណើរការ​រង​ %s បាន​ទទួល​កំហុស​ការ​ចែកជាចម្រៀក​ ។"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2368,7 +2471,7 @@ msgstr "ដំណើរការ​រង​ %s បានត្រឡប់​�
 #: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក"
+msgstr "ដំណើរការ​រង​ %s បានចេញ ដោយ​មិន​រំពឹង​ទុក​ "
 
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
 #, c-format
@@ -2376,9 +2479,9 @@ msgid "Could not open file %s"
 msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2389,49 +2492,50 @@ msgid "Failed to exec compressor "
 msgstr "បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​បង្ហាប់ "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "មាន​បញ្ហា​ក្នុងការ​បិទ​ឯកសារ"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "មានបញ្ហា​ក្នុងការ​ផ្ដាច់តំណ​ឯកសារ"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
-msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ"
+msgstr "មានបញ្ហា​ក្នុង​ការធ្វើ​សមកាលកម្មឯកសារ​"
 
 #: apt-pkg/pkgcache.cc:148
 msgid "Empty package cache"
-msgstr "ឃ្លាំង​កញ្ចប់​ទទេ"
+msgstr "ឃ្លាំង​កញ្ចប់​ទទេ​"
 
 #: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
-msgstr "ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ"
+msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
 #: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
-msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា"
+msgstr "ឯកសារ​ឃ្លាំងសម្ងាត់​​កញ្ចប់​ជាកំណែ​មិន​ត្រូវគ្នា​"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "​​ឯកសារ​ឃ្លាំង​កញ្ចប់​មិន​ត្រឹមត្រូវ​"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2440,11 +2544,11 @@ msgstr "APT នេះ មិនគាំទ្រ​ប្រព័ន្ធ​
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
-msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា"
+msgstr "ឃ្លាំង​សម្ងាត់​កញ្ចប់ត្រូវ​បានស្ថាបនា់​សម្រាប់ស្ថាបត្យករ​ខុស​ៗគ្នា​​"
 
 #: apt-pkg/pkgcache.cc:305
 msgid "Depends"
-msgstr "អាស្រ័យ"
+msgstr "អាស្រ័យ​"
 
 #: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
@@ -2452,11 +2556,11 @@ msgstr "អាស្រ័យជា​មុន"
 
 #: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
-msgstr "ផ្ដល់យោបល់"
+msgstr "ផ្ដល់យោបល់​"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
-msgstr "ផ្តល់​អនុសាសន៍"
+msgstr "ផ្តល់​អនុសាសន៍​"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
@@ -2464,7 +2568,7 @@ msgstr "ប៉ះទង្គិច"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
-msgstr "ជំនួស"
+msgstr "ជំនួស​"
 
 #: apt-pkg/pkgcache.cc:307
 msgid "Obsoletes"
@@ -2480,7 +2584,7 @@ msgstr ""
 
 #: apt-pkg/pkgcache.cc:318
 msgid "important"
-msgstr "សំខាន់"
+msgstr "សំខាន់​"
 
 #: apt-pkg/pkgcache.cc:318
 msgid "required"
@@ -2504,25 +2608,26 @@ msgstr "កំពុងស្ថាបនា​មែកធាងភាពអា
 
 #: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
-msgstr "កំណែ​សាកល្បង"
+msgstr "កំណែ​សាកល្បង​"
 
 #: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
-msgstr "ការបង្កើត​ភាពអាស្រ័យ"
+msgstr "ការបង្កើត​ភាពអាស្រ័យ​"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "បញ្ចូល​​ព័ត៌មាន​ដែលមាន​ចូល​គ្នា"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "បរាជ័យ​ក្នុង​ការ​បើក %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2535,29 +2640,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់​ %s (2) បានឡើយ"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "បន្ទាត់ Malformed  %lu ក្នុង​បញ្ជី​ប្រភព​ %s (dist ញែក​)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2612,9 +2717,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2630,7 +2735,7 @@ msgstr ""
 #: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ"
+msgstr "ប្រភេទ​ឯកសារ​លិបិក្រម​ '%s' មិនត្រូវ​បាន​គាំទ្រ​"
 
 #: apt-pkg/algorithms.cc:261
 #, c-format
@@ -2651,25 +2756,27 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "មិន​អាច​កែ​បញ្ហាបានទេេ អ្កបានទុក​កញ្ចប់​ដែល​ខូច ។។"
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"ឯកសារ​លិបិក្រម​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​​ទាញ​យក ​ពួកវាត្រូវបាន​មិន​អើពើ​ ឬ ប្រើ​​ឯកសារ​ចាស់​ជំនួសវិញ ​​។"
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "ថត​ប័ណ្ណសារ​ %spartial គឺ​បាត់បង់​ ។"
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2691,7 +2798,7 @@ msgstr "មិនអាច​រកឃើញ​កម្មវិធី​បញ
 #: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ"
+msgstr "វិធីសាស្ត្រ​ %s មិន​អាច​ចាប់​ផ្តើម​ត្រឹមត្រូវ​ទេ​"
 
 #: apt-pkg/acquire-worker.cc:440
 #, c-format
@@ -2736,9 +2843,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "កំណត់ត្រា​មិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារចំណង់ចំណូលចិត្ត មិនមាន​បឋមកថា​កញ្ចប់ទេ"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2763,9 +2870,9 @@ msgstr "ឃ្លាំងសម្ងាត់​មិន​ត្រូវ​
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2776,8 +2883,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "អស្ចារ្យ អ្នក​មាន​កំណែ​លើស​ចំនួន​   APT នេះ​ឆបគ្នា​ ។"
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2804,7 +2912,7 @@ msgstr "ការផ្ដល់​ឯកសារ​ប្រមូលផ្ដ
 
 #: apt-pkg/pkgcachegen.cc:1389 apt-pkg/pkgcachegen.cc:1396
 msgid "IO Error saving source cache"
-msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព"
+msgstr "IO កំហុសក្នុងការររក្សាទុក​ឃ្លាំង​សម្ងាត់​ប្រភព​"
 
 #: apt-pkg/acquire-item.cc:139
 #, c-format
@@ -2813,12 +2921,13 @@ msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (
 
 #: apt-pkg/acquire-item.cc:599
 msgid "MD5Sum mismatch"
-msgstr "MD5Sum មិន​ផ្គួផ្គង"
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2828,9 +2937,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2886,17 +2995,17 @@ msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្
 
 #: apt-pkg/acquire-item.cc:1862
 msgid "Size mismatch"
-msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង"
+msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2904,14 +3013,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "មិនអាច​ញែក​ឯកសារកញ្ចប់ %s (1) បានឡើយ"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2925,7 +3034,7 @@ msgid ""
 "Mounting CD-ROM\n"
 msgstr ""
 "ការប្រើប្រាស់​ចំណុចម៉ោន​ ស៊ីឌី​-រ៉ូម​ %s\n"
-"កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម\n"
+"កំពុង​ម៉ោន​ស៊ីឌី-រ៉ូម​\n"
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
@@ -2934,11 +3043,12 @@ msgstr "កំពុង​ធ្វើអត្តសញ្ញាណនា​..
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "បានទុក​ស្លាក ៖ %s\n"
+msgstr "បានទុក​ស្លាក ៖ %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "មិនកំពុងម៉ោន ស៊ីឌី​-រ៉ូម​ ទេ..."
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -2947,7 +3057,7 @@ msgstr "ប្រើប្រាស់ចំណុចម៉ោន​ ស៊ី�
 
 #: apt-pkg/cdrom.cc:660
 msgid "Unmounting CD-ROM\n"
-msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម\n"
+msgstr "ការមិនម៉ោន​ ស៊ីឌី-រ៉ូម​\n"
 
 #: apt-pkg/cdrom.cc:665
 msgid "Waiting for disc...\n"
@@ -2962,11 +3072,11 @@ msgid "Scanning disc for index files..\n"
 msgstr "កំពុង​ស្កេន​ឌីស​សម្រាប់​​ឯកសារ​លិបិក្រម​..\n"
 
 #: apt-pkg/cdrom.cc:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
-msgstr ""
+msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
@@ -2975,9 +3085,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:782
-#, c-format
+#, fuzzy, c-format
 msgid "Found label '%s'\n"
-msgstr ""
+msgstr "បានទុក​ស្លាក ៖ %s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3017,12 +3127,12 @@ msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួ�
 #: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
-msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង\n"
+msgstr "បានសរសេរ​ %i កំណត់ត្រា​ជាមួយួយ​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​\n"
 
 #: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង\n"
+msgstr "បានសរសេរ %i កំណត់ត្រា​ជាមួយ​ %i ឯកសារ​ដែល​បាត់បង់​ និង​ %i ឯកសារ​ដែល​មិន​បាន​ផ្គួផ្គង​ ​\n"
 
 #: apt-pkg/indexcopy.cc:515
 #, c-format
@@ -3030,9 +3140,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3041,9 +3151,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3056,14 +3166,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3113,9 +3223,9 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "បាន​ដំឡើង %s"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
@@ -3128,9 +3238,9 @@ msgid "Removing %s"
 msgstr "កំពុង​យក %s ចេញ"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "បាន​យក %s ចេញ​ទាំង​ស្រុង"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3144,14 +3254,14 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "រាយបញ្ជី​ថត​ %spartial គឺ​បាត់បង់​ ។"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3251,9 +3361,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3267,79 +3377,199 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "បរាជ័យក្នុងការយក %s ចេញ"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+#~ msgid "Unable to create %s"
+#~ msgstr "មិន​អាច​បង្កើត​ %s បានឡើយ"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "បរាជ័យ​ក្នុងការដាក់ទិតាំង​ឯកសារ​ត្រួតពិនិត្យ​ដែលត្រឹមត្រូវ"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "បរាជ័យ​ក្នុងការថ្លែង %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "មិនអាច​ប្ដូរ​ទៅជា​ %s បានឡើយ"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា​"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "កំហុស​ក្នុងការញែក​ MD5 ។ អុហ្វសិត​ %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរទៅជា​ថតអ្នកគ្រប់គ្រង %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "ផ្នែក​ ConfFile ខូច នៅក្នុង​ឯកសារ​ស្ថានភាព ។ អុហ្វសិត​ %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "កំហុស​ក្នុង​ការ ក្នុងការ​ទទួល​យក​ឈ្មោះកញ្ចប់"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "បរាជ័យ​ក្នុងការរកកញ្ចប់ ៖ បឋមកថា​ អុហ្វសិត %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "កំពុង​អាន​បញ្ជី​ឯកសារ"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "ឃ្លាំងសម្ងាត់ pkg ត្រូវ​តែ​ចាប់ផ្តើម​ដំឡើងមុន"
+#~ 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' ។ ប្រសិនបើ​អ្នក​មិន​អាច​ស្តារ​ឯកសារ​នេះបានទេ បន្ទាប់​"
+#~ "មក​ធ្វើឲ្យវា​ទទេ ហើយ​ដំឡើង​កញ្ចប់ដែលកំណែ​ដូចគ្នា​ឡើងវិញភ្លាមៗ !"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "កំហុស​ខាងក្នុង​ ក្នុង​ការបន្ថែម​ការបង្វែរ"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "បរាជ័យ​ក្នុងការ​អាន​ឯកសារបញ្ជី​ %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "កំហុស​ខាងក្នុង ក្នុង​​ការ​ទទួល​យក​ថ្នាំង​"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "បរាជ័យ​ក្នុងការ​បើក​ឯកសារបង្វែរ​ %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "ឯកសារ​បង្វែរ​បានខូច"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "បរាជ័យ​ក្នុងការ​បើក​ឯកសារបង្វែរ​ %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "បន្ទាត់​ដែលមិនត្រឹមត្រូវ​នៅក្នុង​ឯកសារ​បង្វែរ ៖ %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "កំហុស​ខាងក្នុង ក្នុង​​ការ​ទទួល​យក​ថ្នាំង"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "កំហុស​ខាងក្នុង​ ក្នុង​ការបន្ថែម​ការបង្វែរ​"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "បរាជ័យ​ក្នុងការ​អាន​ឯកសារបញ្ជី​ %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "ឃ្លាំងសម្ងាត់ pkg ត្រូវ​តែ​ចាប់ផ្តើម​ដំឡើងមុន"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "បរាជ័យ​ក្នុងការរកកញ្ចប់ ៖ បឋមកថា​ អុហ្វសិត %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "ផ្នែក​ ConfFile ខូច នៅក្នុង​ឯកសារ​ស្ថានភាព ។ អុហ្វសិត​ %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "កំហុស​ក្នុងការញែក​ MD5 ។ អុហ្វសិត​ %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "មិនអាច​ប្ដូរ​ទៅជា​ %s បានឡើយ"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "បរាជ័យ​ក្នុងការដាក់ទិតាំង​ឯកសារ​ត្រួតពិនិត្យ​ដែលត្រឹមត្រូវ​"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "មិន​អាច​បើក​បំពុង​សម្រាប់​ %s បានឡើយ"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "អាចន​កំហុស​ពី​ដំណើរការ %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "យកបន្ទាត់​បឋមកថា​តែមួយ​​ ដែលលើស %u តួអក្សរ"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Malformed បដិសេធ %s បន្ទាត់ %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Malformed បដិសេធ %s បន្ទាត់​ %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "កម្មវិធី​ពន្លា"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "អាន​, នៅតែ​មាន %lu ដើម្បី​អាន​ ប៉ុន្តែ​គ្មាន​អ្វី​នៅសល់"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "សរសេរ​, នៅតែមាន​ %lu ដើម្បី​សរសេរ​ ប៉ុន្តែ​មិន​អាច​"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "កំហុស​បាន​កើត​ឡើង​​ ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កញ្ចប់​ថ្មី​)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើ​កញ្ចប់​១​)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់២)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "កំហុស​បានកើត​ឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ១ថ្មី​)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "កំហុស​បាន​កើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (ប្រើកញ្ចប់​៣)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​ %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "កំហុស​បានកើតឡើង​ខណៈពេល​កំពុង​ដំណើរការ​%s (ផ្តល់​ឯកសារ​ប្រមូល​ផ្តុំ)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "កំហុស​ខាងក្នុង មិន​អាចដាក់ទីតាំង​ឲ្យ​សមាជិក​បានឡើយ"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E ៖ បញ្ជី​អាគុយ​ម៉ង់​ពី​ Acquire::gpgv::Options too long ។ ចេញ​ ។"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "កំហុស​បាន​កើត​ឡើង​ខណៈ​ពេល​កំពុង​ដំណើរការ​ %s (កំណែ២​ថ្មី​)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "មិន​អាច​ចូល​ដំណើរការ keyring ៖ '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "​កំហុស​ដំណើរការ​ថត​ %s"
 
 #~ 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!"
+#~ "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 ""
-#~ "បរាជ័យ​ក្នុងការ​បើក​ឯកសារ​បញ្ជី​ '%sinfo/%s' ។ ប្រសិនបើ​អ្នក​មិន​អាច​ស្តារ​ឯកសារ​នេះបានទេ បន្ទាប់​"
-#~ "មក​ធ្វើឲ្យវា​ទទេ ហើយ​ដំឡើង​កញ្ចប់ដែលកំណែ​ដូចគ្នា​ឡើងវិញភ្លាមៗ !"
+#~ "ចាប់​តាំង​ពី​អ្នក​បាន​ស្នើរ​ប្រតិបត្តិការ​តែមួយមក​ វាទំនង​ហាក់​ដូចជា​\n"
+#~ "កញ្ចប់ដែលមិនអាចដំឡើងបានដោយងាយ ហើយនិង​ការប្រឆាំងនឹង​របាយការណ៍​កំហុស\n"
+#~ "កញ្ចប់​នោះ​ គួរតែត្រូវបានបរាជ័យ ។"
 
-#~ msgid "Reading file listing"
-#~ msgstr "កំពុង​អាន​បញ្ជី​ឯកសារ"
-
-#~ msgid "Internal error getting a package name"
-#~ msgstr "កំហុស​ក្នុង​ការ ក្នុងការ​ទទួល​យក​ឈ្មោះកញ្ចប់"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "បន្ទាត់​ %d វែងពេក​ (អតិបរមា %d)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ប្ដូរទៅជា​ថតអ្នកគ្រប់គ្រង %sinfo"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "បន្ទាត់​ %d វែងពេក​ (អតិបរមា %d)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "ថតព័ត៌មាន​ និង ពុម្ព ត្រូវការនៅលើ​ប្រព័ន្ធឯកសារ​ដូចគ្នា"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "បរាជ័យ​ក្នុងការថ្លែង %sinfo"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "កំហុស​បានកើតឡើង​ ខណៈពេល​កំពុង​ដំណើរការ​ %s (កំណែ​​​ឯកសារ​ថ្មី​១)"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "មិន​អាច​បង្កើត​ %s បានឡើយ"
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "បានទុក​ស្លាក ៖ %s \n"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "បរាជ័យក្នុងការយក %s ចេញ"
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr "បានរកឃើញ លិបិក្រម​កញ្ចប់ %i  លិបិក្រម​ប្រភព%i  និង ហត្ថលេខា %i \n"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ\n"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "ជ្រើស​បាន​បរាជ័យ​"
diff --git a/po/ko.po b/po/ko.po
index 5389d2c11..d00ab0240 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
+"PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
 "Language: ko\n"
@@ -14,8 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -161,6 +159,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -196,6 +195,42 @@ 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 파일1 [파일2 ...]\n"
+"        apt-cache [옵션] showpkg 패키지1 [패키지2 ...]\n"
+"        apt-cache [옵션] showsrc 패키지1 [패키지2 ...]\n"
+"\n"
+"apt-cache는 APT의 바이너리 캐시 파일을 처리하고, 캐시 파일에\n"
+"정보를 질의하는 저수준 도구입니다.\n"
+"\n"
+"명령:\n"
+"   add - 소스 캐시에 패키지 파일을 추가합니다\n"
+"   gencaches - 패키지 캐시 및 소스 캐시를 만듭니다\n"
+"   showpkg - 한 개의 패키지에 대한 일반적인 정보를 봅니다\n"
+"   showsrc - 소스 기록을 봅니다\n"
+"   stats - 기본적인 통계를 봅니다\n"
+"   dump - 전체 파일을 간략한 형태로 봅니다\n"
+"   dumpavail - 사용 가능한 파일을 표준출력에 표시합니다\n"
+"   unmet - 맞지 않는 의존성을 봅니다\n"
+"   search - 정규식 패턴에 맞는 패키지 목록을 찾습니다\n"
+"   show - 패키지에 대해 읽을 수 있는 기록을 봅니다\n"
+"   showauto - 자동으로 설치한 패키지 목록을 표시합니다\n"
+"   depends - 패키지에 대해 의존성 정보를 그대로 봅니다\n"
+"   rdepends - 패키지의 역 의존성 정보를 봅니다\n"
+"   pkgnames - 시스템에 들어 있는 패키지의 이름을 모두 봅니다\n"
+"   dotty - GraphViz용 패키지 그래프를 만듭니다\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"
+"좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -376,7 +411,7 @@ msgstr " [설치함]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [후보 버전 아님]"
+msgstr "[후보 버전 아님]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -409,14 +444,14 @@ msgstr "'%s' 패키지와 같은 가상 패키지는 제거할 수 없습니다\
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -455,9 +490,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -709,10 +744,10 @@ msgid_plural ""
 msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -766,7 +801,7 @@ msgstr "%s 패키지를 찾을 수 없습니다"
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s 패키지 자동설치로 지정합니다.\n"
+msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -823,12 +858,15 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"패키지의 최근 (아마도 릴리스되지 않은) 업데이트를 받으려면\n"
+"다음과 같이 하십시오:\n"
+"bzr get %s\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -909,11 +947,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s 패키지에 빌드 의존성이 없습니다.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
+"다"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -932,18 +972,22 @@ msgstr ""
 "무 최근 버전입니다"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버"
+"전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니"
+"다"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -960,15 +1004,16 @@ msgid "Failed to process build dependencies"
 msgstr "빌드 의존성을 처리하는데 실패했습니다"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "%s(%s)에 연결하는 중입니다"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1013,6 +1058,47 @@ msgid ""
 "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와 install입니다.\n"
+"\n"
+"명령어:\n"
+"   update - 패키지 목록을 새로 가져옵니다\n"
+"   upgrade - 업그레이드를 합니다\n"
+"   install - 새 패키지를 설치합니다 (패키지는 libc6 식으로. libc6.deb 아님)\n"
+"   remove - 패키지를 지웁니다\n"
+"   autoremove - 사용하지 않는 패키지를 자동으로 전부 지웁니다\n"
+"   purge - 패키지를 완전히 지웁니다\n"
+"   source - 소스 아카이브를 다운로드합니다\n"
+"   build-dep - 소스 패키지의 빌드 의존성을 설정합니다\n"
+"   dist-upgrade - 배포판 업그레이드, apt-get(8) 참고\n"
+"   dselect-upgrade - dselect에서 선택한 걸 따릅니다\n"
+"   clean - 내려받은 아카이브 파일들을 지웁니다\n"
+"   autoclean - 과거에 내려받은 아카이브 파일들을 지웁니다\n"
+"   check - 의존성이 망가지지 않았는지 확인합니다\n"
+"   markauto - 패키지를 자동 설치로 표시합니다\n"
+"   unmarkauto - 패키지를 수동 설치로 표시합니다\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)나\n"
+"apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
+"                       이 APT는 Super Cow Powers로 무장했습니다.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1036,7 +1122,7 @@ msgstr "받기:"
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "무시 "
+msgstr "무시"
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
@@ -1064,29 +1150,29 @@ msgstr ""
 " '%1$s'\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "하지만 설치하지 않았습니다"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s 패키지는 이미 최신 버전입니다.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1095,14 +1181,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s 패키지 수동설치로 지정합니다.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "%s 파일을 여는데 실패했습니다"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1509,9 +1595,9 @@ msgstr "'%s' 미러 파일이 없습니다 "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "'%s' 미러 파일이 없습니다 "
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1865,19 +1951,19 @@ msgid "Unable to open %s"
 msgstr "%s 열 수 없습니다"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1930,6 +2016,7 @@ msgid "Failed to rename %s to %s"
 msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1942,6 +2029,16 @@ 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"
+"\n"
+"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
+"도구입니다\n"
+"\n"
+"옵션:\n"
+"  -h   이 도움말\n"
+"  -t   임시 디렉토리 설정\n"
+"  -c=? 설정 파일을 읽습니다\n"
+"  -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1978,7 +2075,7 @@ msgstr "파이프 만들기가 실패했습니다"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "gzip 실행이 실패했습니다 "
+msgstr "gzip 실행이 실패했습니다"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2141,9 +2238,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "%i 파일 디스크립터를 복사할 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2418,14 +2515,14 @@ msgid "Failed to exec compressor "
 msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2459,8 +2556,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "패키지 캐시 파일이 호환되지 않는 버전입니다"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "패키지 캐시 파일이 손상되었습니다"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2644,9 +2742,9 @@ msgstr ""
 "서 APT::Immediate-Configure 항목을 보십시오. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "'%s' 파일을 열 수 없습니다"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2684,10 +2782,13 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "문제를 바로잡을 수 없습니다. 망가진 고정 패키지가 있습니다."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
+"의 버전을 대신 사용합니다."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2797,9 +2898,9 @@ msgstr "캐시의 버전 시스템이 호환되지 않습니다"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2852,7 +2953,7 @@ msgstr "MD5Sum이 맞지 않습니다"
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
 msgid "Hash Sum mismatch"
-msgstr "해시 값이 맞지 않습니다"
+msgstr "해시 합이 맞지 않습니다"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2862,9 +2963,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3017,7 +3118,7 @@ msgstr ""
 #: apt-pkg/cdrom.cc:782
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "레이블 발견: %s\n"
+msgstr "레이블 발견: %s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3311,33 +3412,68 @@ msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오. "
+"dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "잠기지 않음"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "%s 패키지를 설치하지 않았으므로, 지우지 않습니다\n"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "%s 파일은 없으므로 무시합니다"
+
+#~ msgid "Failed to remove %s"
+#~ msgstr "%s을(를) 지우는데 실패했습니다"
 
 #~ msgid "Unable to create %s"
 #~ msgstr "%s을(를) 만들 수 없습니다"
 
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "%sinfo의 정보를 읽는데 실패했습니다"
+
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다"
 
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "관리 디렉토리를 %sinfo로 바꾸는데 실패했습니다"
+
+#~ msgid "Internal error getting a package name"
+#~ msgstr "패키지 이름을 가져오는데 내부 오류"
+
 #~ msgid "Reading file listing"
 #~ msgstr "파일 목록을 읽는 중입니다"
 
+#~ 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' 파일을 여는데 실패했습니다. 이 파일을 복구할 수 없다"
+#~ "면 비워 놓고 같은 버전의 패키지를 다시 설치하십시오!"
+
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "목록 파일 %sinfo/%s 파일을 읽는데 실패했습니다"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "노드를 얻어 오는데 내부 오류"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "전환 파일 %sdiversions를 여는데 실패했습니다"
+
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "전환 파일이 손상되었습니다"
 
 #~ msgid "Invalid line in the diversion file: %s"
 #~ msgstr "전환 파일에 잘못된 줄이 있습니다: %s"
 
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "diversion을 추가하는데 내부 오류"
+
 #~ msgid "The pkg cache must be initialized first"
 #~ msgstr "패키지 캐시를 먼저 초기화해야 합니다"
 
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "패키지를 찾는데 실패했습니다: 헤더, 오프셋 %lu"
+
 #~ msgid "Bad ConfFile section in the status file. Offset %lu"
 #~ msgstr "status 파일에서 ConfFile 섹션이 잘못되었습니다. 오프셋 %lu"
 
@@ -3347,65 +3483,81 @@ msgstr "잠기지 않음"
 #~ msgid "Couldn't change to %s"
 #~ msgstr "%s 디렉토리로 이동할 수 없습니다"
 
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "올바른 control 파일을 찾는데 실패했습니다"
+
 #~ msgid "Couldn't open pipe for %s"
 #~ msgstr "%s에 대한 파이프를 열 수 없습니다"
 
+#~ msgid "Read error from %s process"
+#~ msgstr "%s 프로세스에서 읽는데 오류가 발생했습니다"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "헤더 한 줄에 %u개가 넘는 문자가 들어 있습니다"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "override %s의 %lu번 줄 #1이 잘못되었습니다"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "%s을(를) 지우는데 실패했습니다"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "override %s의 %lu번 줄 #2가 잘못되었습니다"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "%sinfo의 정보를 읽는데 실패했습니다"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "관리 디렉토리를 %sinfo로 바꾸는데 실패했습니다"
+#~ msgid "decompressor"
+#~ msgstr "압축 해제 프로그램"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "패키지 이름을 가져오는데 내부 오류"
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
 #~ 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!"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "목록 파일 '%sinfo/%s' 파일을 여는데 실패했습니다. 이 파일을 복구할 수 없다"
-#~ "면 비워 놓고 같은 버전의 패키지를 다시 설치하십시오!"
+#~ "이미 압축이 풀린 '%s' 패키지에 대해 즉시 설정을 할 수 없습니다. 자세한 설"
+#~ "명은 man 5 apt.conf 페이지에서 APT::Immediate-Configure 항목을 보십시오."
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "목록 파일 %sinfo/%s 파일을 읽는데 실패했습니다"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewPackage)"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "노드를 얻어 오는데 내부 오류"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage1)"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "전환 파일 %sdiversions를 여는데 실패했습니다"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "diversion을 추가하는데 내부 오류"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage2)"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "패키지를 찾는데 실패했습니다: 헤더, 오프셋 %lu"
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "올바른 control 파일을 찾는데 실패했습니다"
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion%d)"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "%s 프로세스에서 읽는데 오류가 발생했습니다"
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (UsePackage3)"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "동적 mmap이 한계를 벗어났습니다. APT::Cache-Limit의 크기를 높이십시오. 현"
-#~ "재 값: %lu. (man 5 apt.conf)"
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileDesc1)"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "%s 파일은 없으므로 무시합니다"
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s 처리 중에 오류가 발생했습니다 (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "내부 오류, 멤버를 찾을 수 없습니다"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "내부 오류, '%s' 그룹에 설치할 수 있는 패키지가 없습니다."
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release 파일이 만료되었습니다. %s 무시. (%s 이후로 무효)"
diff --git a/po/ku.po b/po/ku.po
index c81b7dc55..74535c248 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -9,16 +9,15 @@ msgstr ""
 "Project-Id-Version: apt-ku\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2010-12-26 16:15+0000\n"
-"Last-Translator: Michael Vogt <michael.vogt@ubuntu.com>\n"
+"PO-Revision-Date: 2008-05-08 12:48+0200\n"
+"Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: KAider 0.1\n"
+"Plural-Forms: nplurals=2; plural= n != 1;\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -27,27 +26,28 @@ msgstr ""
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "Navên paketan bi giştî : "
+msgstr "Navên paketan bi giştî :"
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Navên paketan bi giştî :"
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  Pakêtên normal: "
+msgstr "  Pakêtên normal:"
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Pakêtên farazî yên safî: "
+msgstr "  Pakêtên farazî yên safî:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  Pakêta tenê ya farazî: "
+msgstr "  Pakêta tenê ya farazî:"
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  Pakêtên hevbeş yên farazî: "
+msgstr "  Pakêtên hevbeş yên farazî:"
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
@@ -55,23 +55,25 @@ msgstr "  Winda: "
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "Guhertoyên vekirî yên giştî: "
+msgstr "Guhertoyên vekirî yên giştî:"
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Guhertoyên vekirî yên giştî:"
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "Bindestên giştî: "
+msgstr "Bindestên giştî:"
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr ""
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "Guhertoyên vekirî yên giştî:"
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
@@ -87,7 +89,7 @@ msgstr ""
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Cihê giştî yê sist: "
+msgstr "Cihê giştî yê sist:"
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -105,8 +107,9 @@ msgid "No packages found"
 msgstr "Pakêt nayên dîtin"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "Pêwist e tu mînakekê bidî"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -148,7 +151,7 @@ msgstr "(ne tiştek)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  Destika pakêtê: "
+msgstr "  Destika pakêtê:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -159,9 +162,9 @@ msgstr "  Tabloya guhertoyan:"
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s ji bo %s %s komkirî di %s %s de\n"
 
 #: cmdline/apt-cache.cc:1686
 msgid ""
@@ -201,17 +204,18 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "Ji kerema xwe re navekî li vî Dîsketî bike, wekî 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "Anîna %s %s biserneket\n"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -323,7 +327,7 @@ msgstr ""
 #: cmdline/apt-get.cc:563
 #, c-format
 msgid "%s (due to %s) "
-msgstr "%s (ji ber %s) "
+msgstr "%s (ji ber %s)"
 
 #: cmdline/apt-get.cc:571
 msgid ""
@@ -334,22 +338,22 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin. "
+msgstr "%lu hatine bilindkirin, %lu nû hatine sazkirin."
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu ji nû ve sazkirî, "
+msgstr "%lu ji nû ve sazkirî,"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu hatine nizmkirin. "
+msgstr "%lu hatine nizmkirin."
 
 #: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu werin rakirin û %lu neyên bilindkirin.\n"
+msgstr "%lu werin rakirin û %lu neyên bilindkirin. \n"
 
 #: cmdline/apt-get.cc:614
 #, c-format
@@ -376,8 +380,9 @@ msgid " [Installed]"
 msgstr " [Sazkirî]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Guhartoyên berendam"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -442,9 +447,9 @@ msgid "%s is already the newest version.\n"
 msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "lê %s dê were sazkirin"
 
 #: cmdline/apt-get.cc:884
 #, c-format
@@ -581,7 +586,7 @@ msgstr "Betal."
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "Dixwazî bidomînî [E/n]? "
+msgstr "Dixwazî bidomînî [E/n]?"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -677,21 +682,22 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
+msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ev pakêtên NÛ dê werine sazkirin:"
+msgstr[1] "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -743,9 +749,9 @@ msgid "Couldn't find package %s"
 msgstr "Nikarî pakêta %s bibîne"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "lê %s dê were sazkirin"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -755,7 +761,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Bilindkirin tê hesibandin... "
+msgstr "Bilindkirin tê hesibandin..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -933,9 +939,9 @@ msgid "Failed to process build dependencies"
 msgstr ""
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Girêdan bi %s (%s) re pêk tê"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
@@ -1009,12 +1015,12 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "Çewt "
+msgstr "Çewt"
 
 #: cmdline/acqprogress.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr ""
+msgstr "%s hatine anîn..."
 
 #: cmdline/acqprogress.cc:230
 #, c-format
@@ -1030,29 +1036,29 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "lê ne sazkirî ye"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "lê %s dê were sazkirin"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "lê %s dê were sazkirin"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s jixwe guhertoya nûtirîn e.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1061,14 +1067,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "lê %s dê were sazkirin"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "%s venebû"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1097,9 +1103,9 @@ msgid ""
 msgstr ""
 
 #: methods/cdrom.cc:203
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr ""
+msgstr "Pakêt nehate dîtin %s"
 
 #: methods/cdrom.cc:212
 msgid ""
@@ -1126,8 +1132,9 @@ msgstr "Pel nehate dîtin"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
+#, fuzzy
 msgid "Failed to stat"
-msgstr ""
+msgstr "%s venebû"
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
@@ -1263,9 +1270,9 @@ msgid "Problem hashing file"
 msgstr ""
 
 #: methods/ftp.cc:885
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr ""
+msgstr "Danegira %s nehate vekirin: %s"
 
 #: methods/ftp.cc:900 methods/rsh.cc:330
 msgid "Data socket timed out"
@@ -1282,8 +1289,9 @@ msgid "Query"
 msgstr "Lêpirsîn"
 
 #: methods/ftp.cc:1119
+#, fuzzy
 msgid "Unable to invoke "
-msgstr ""
+msgstr "%s venebû"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1338,9 +1346,9 @@ msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Nikare bi %s re girêdan pêk bîne %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1360,8 +1368,9 @@ msgid "Unknown error executing gpgv"
 msgstr "Di xebitandina gpgv de çewtiya nenas"
 
 #: methods/gpgv.cc:228 methods/gpgv.cc:235
+#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "Ev pakêtên NÛ dê werine sazkirin:"
 
 #: methods/gpgv.cc:242
 msgid ""
@@ -1410,8 +1419,9 @@ msgid "Connection timed out"
 msgstr ""
 
 #: methods/http.cc:846
+#, fuzzy
 msgid "Error writing to output file"
-msgstr ""
+msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî"
 
 #: methods/http.cc:877
 msgid "Error writing to file"
@@ -1470,9 +1480,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Nikarî pelê %s veke"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1833,6 +1843,7 @@ msgid "Failed to rename %s to %s"
 msgstr ""
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1845,6 +1856,18 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Bikaranîn: apt-config [vebijark] ferman\n"
+"apt-config, amûra xwendina dosyeya mîhengên APTê ye\n"
+"\n"
+"Ferman\n"
+"  shell - moda shell\n"
+"  dump - Mîhengan nîşan dide\n"
+"\n"
+"Vebijark:\n"
+"  -h Ev dosyeya alîkariyê ye.\n"
+"  -c=? Dosyeya mîhengan nîşan dide\n"
+"  -o=? Rê li ber vedike ku tu karibe li gorî dilê xwe vebijarkan diyar bike. "
+"mînak -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1865,12 +1888,13 @@ msgid ""
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
+#, fuzzy
 msgid "Failed to create pipes"
-msgstr ""
+msgstr "%s ji hev nehate veçirandin"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Xebitandina gzip biserneket "
+msgstr "Xebitandina gzip biserneket"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -1919,8 +1943,9 @@ msgid "Failed to locate the hash element!"
 msgstr ""
 
 #: apt-inst/filelist.cc:461
+#, fuzzy
 msgid "Failed to allocate diversion"
-msgstr ""
+msgstr "%s venebû"
 
 #: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
@@ -1972,8 +1997,9 @@ msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
 #: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#, fuzzy
 msgid "The diversion path is too long"
-msgstr ""
+msgstr "Lîsteya dirêjahiya çavkaniyê zêde dirêj e"
 
 #: apt-inst/extract.cc:243
 #, c-format
@@ -1999,9 +2025,9 @@ msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 #: apt-inst/extract.cc:492
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to stat %s"
-msgstr ""
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
 #, c-format
@@ -2033,17 +2059,19 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Nikarî li %s biguherîne"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "%s venebû"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "%s venebû"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2051,8 +2079,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Nivîsîna pelê %s biserneket"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2214,18 +2243,18 @@ msgid "Invalid operation %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:56
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to stat the mount point %s"
-msgstr ""
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
 #: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2294,9 +2323,9 @@ msgid "Could not open file %s"
 msgstr "Nikarî pelê %s veke"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Nikarî pelê %s veke"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2317,19 +2346,19 @@ msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Di girtina pelî de pirsgirêkek derket"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2438,19 +2467,19 @@ msgid "Failed to open StateFile %s"
 msgstr "Vekirina StateFile %s biserneket"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "%s ji hev nehate veçirandin"
 
 #: apt-pkg/tagfile.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr ""
+msgstr "Pakêt nehate dîtin %s"
 
 #: apt-pkg/tagfile.cc:216
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr ""
+msgstr "Pakêt nehate dîtin %s"
 
 #: apt-pkg/sourcelist.cc:96
 #, c-format
@@ -2530,9 +2559,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Nikarî pelê %s veke"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2570,19 +2599,19 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Peldanka '%s' kêm e"
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Peldanka '%s' kêm e"
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "W: pelrêça %s nayê xwendin\n"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2607,9 +2636,9 @@ msgid "Method %s did not start correctly"
 msgstr ""
 
 #: apt-pkg/acquire-worker.cc:440
-#, c-format
+#, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
+msgstr "Dîsketê siwar bike û piştre bişkoja derbaskirinê bitikîne"
 
 #: apt-pkg/init.cc:152
 #, c-format
@@ -2621,9 +2650,9 @@ msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
 #: apt-pkg/clean.cc:57
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to stat %s."
-msgstr ""
+msgstr "Nivîsandin ji bo %s ne pêkane"
 
 #: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
@@ -2676,9 +2705,9 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Dema şixulandina naveroka %s çewtî"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2741,9 +2770,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Pakêt nehate dîtin %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2799,9 +2828,9 @@ msgid "Size mismatch"
 msgstr "Mezinahî li hev nayên"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Pakêt nehate dîtin %s"
 
 #: apt-pkg/indexrecords.cc:74
 #, c-format
@@ -2819,9 +2848,9 @@ msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Pakêt nehate dîtin %s"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2938,9 +2967,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Hash Sum li hev nayên"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -2949,9 +2978,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Sazkirin tê betalkirin."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -2964,14 +2993,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Peywira %s nehate dîtin"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Nikarî pakêta %s bibîne"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3021,9 +3050,9 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "%s hatine sazkirin"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
@@ -3036,9 +3065,9 @@ msgid "Removing %s"
 msgstr "%s tê rakirin"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "%s bi tevahî hatine rakirin"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3057,9 +3086,9 @@ msgid "Directory '%s' missing"
 msgstr "Peldanka '%s' kêm e"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Nikarî pelê %s veke"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3159,9 +3188,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Pelrêça daxistinê nayê quflekirin"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3175,11 +3204,33 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nikarî li %s biguherîne"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Rakirina %s biserneket"
 
 #~ msgid "Unable to create %s"
 #~ msgstr "Nikare %s biafirîne"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Rakirina %s biserneket"
+#, fuzzy
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "%s venebû"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Nikarî li %s biguherîne"
+
+#, fuzzy
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nikarî pelê %s veke"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Danegira %s nehate vekirin: %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Di şixulandina pêrista %s de çewtî"
diff --git a/po/lt.po b/po/lt.po
index 70f0e44b5..9e36044a3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,17 +9,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Gintautas Miliauskas <gintautas@miliauskas.lt>\n"
+"PO-Revision-Date: 2008-08-02 01:47-0400\n"
+"Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
-"%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Launchpad-Export-Date: 2008-08-02 05:04+0000\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -27,12 +24,14 @@ msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Paketas %s versijos numeriu %s turi netenkinamą priklausomybę:\n"
 
 #: cmdline/apt-cache.cc:286
+#, fuzzy
 msgid "Total package names: "
-msgstr ""
+msgstr "Visi paketų pavadinimai: "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Visi paketų pavadinimai: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -59,8 +58,9 @@ msgid "Total distinct versions: "
 msgstr "Viso skirtingų versijų: "
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Viso skirtingų aprašymų: "
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
@@ -210,9 +210,9 @@ msgid "Please insert a Disc in the drive and press enter"
 msgstr "Prašome įdėti diską į įrenginį ir paspausti Enter"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "Nepavyko pervadinti %s į %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -360,14 +360,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu nepilnai įdiegti ar pašalinti.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -379,8 +379,9 @@ msgid " [Installed]"
 msgstr " [Įdiegtas]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Galimos versijos"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -402,9 +403,9 @@ msgid "However the following packages replace it:"
 msgstr "Tačiau šie paketai jį pakeičia:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "Paketas %s neturi diegimo kandidatų"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -413,19 +414,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -434,9 +435,10 @@ msgstr ""
 "Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"Praleidžiamas %s, nes jis jau yra įdiegtas ir atnaujinimas nėra nurodytas.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -454,14 +456,14 @@ msgid "%s set to manually installed.\n"
 msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Pažymėta versija %s (%s) paketui %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -476,8 +478,9 @@ msgid "Unable to correct dependencies"
 msgstr "Nepavyko patenkinti priklausomybių"
 
 #: cmdline/apt-get.cc:1034
+#, fuzzy
 msgid "Unable to minimize the upgrade set"
-msgstr ""
+msgstr "Nepavyko minimizuoti atnaujinimo rinkinio"
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
@@ -689,27 +692,29 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
+msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
+msgstr[1] "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
+msgstr[1] "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -761,9 +766,9 @@ msgid "Couldn't find package %s"
 msgstr "Nepavyko rasti paketo %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -904,11 +909,12 @@ msgid "%s has no build depends.\n"
 msgstr ""
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -926,18 +932,21 @@ msgstr ""
 "per naujas"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos "
+"versijos %s paketo"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -954,9 +963,9 @@ msgid "Failed to process build dependencies"
 msgstr ""
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Jungiamasi prie %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
@@ -1035,7 +1044,7 @@ msgstr "Klaida "
 #: cmdline/acqprogress.cc:140
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Parsiųsta %sB per %s (%sB/s)\n"
+msgstr "Parsiųsta %sB iš %s (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:230
 #, c-format
@@ -1054,29 +1063,29 @@ msgstr ""
 "į įrenginį „%s“ ir paspauskite enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "bet jis nėra įdiegtas"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s ir taip jau yra naujausias.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s ir taip jau yra naujausias.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1085,14 +1094,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Nepavyko atverti %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1362,9 +1371,9 @@ msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Nepavyko prisijungti prie %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1494,9 +1503,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Nepavyko atverti failo %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1539,12 +1548,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "Išpakuojant įvyko klaidų. Bandysiu konfigūruoti"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "paketus, kurie buvo įdiegti. Tai gali sukelti pasikartojančias klaidas"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1732,10 +1743,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
+"Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės "
+"versijos, prašome pašalinkite ir perkurkite duomenų bazę."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1851,19 +1865,19 @@ msgid "Unable to open %s"
 msgstr "Nepavyko atverti %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1916,6 +1930,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Nepavyko pervadinti %s į %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1928,6 +1943,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Naudojimas: apt-extracttemplates failas1 [failas2 ...]\n"
+"\n"
+"apt-extracttemplates tai įrankis skirtas konfigūracijų, bei šablonų "
+"informacijos išskleidimui\n"
+"iš debian paketų\n"
+"\n"
+"Parametrai:\n"
+"  -h Šis pagalbos tekstas\n"
+"  -t Nustatyti laikinąjį aplanką\n"
+"  -c=? Nuskaityti šį konfigūracijų failą\n"
+"  -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2132,12 +2158,14 @@ msgid "Couldn't make mmap of %llu bytes"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Nepavyko atverti %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Nepavyko pakeisti į %s"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2145,8 +2173,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Nepavyko patikrinti %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2317,9 +2346,9 @@ msgid "Failed to stat the cdrom"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Klaida užveriant failą"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2368,9 +2397,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Procesas %s gavo segmentavimo klaidą"
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Procesas %s gavo segmentavimo klaidą"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2388,9 +2417,9 @@ msgid "Could not open file %s"
 msgstr "Nepavyko atverti failo %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Nepavyko atverti failo %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2411,19 +2440,19 @@ msgid "write, still have %llu to write but couldn't"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Klaida užveriant failą"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Klaida sinchronizuojant failą"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Klaida užveriant failą"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2624,9 +2653,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Nepavyko atverti failo %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2658,25 +2687,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Kai kurių indeksų failų nepavyko parsiųsti, jie buvo ignoruoti arba vietoje "
+"jų panaudoti seni."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Trūksta aplanko „%s“"
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Trūksta aplanko „%s“"
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Nepavyko užrakinti sąrašo aplanko"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2772,9 +2804,9 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Klaida apdorojant turinį %s"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2837,9 +2869,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Nepavyko atverti DB failo %s: %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2895,14 +2927,14 @@ msgid "Size mismatch"
 msgstr "Neatitinka dydžiai"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Nepavyko atverti DB failo %s: %s"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2910,14 +2942,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Pastaba: pažymimas %s vietoje %s\n"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Nepavyko atverti DB failo %s: %s"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3034,9 +3066,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Maišos sumos nesutapimas"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3045,9 +3077,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Diegimas nutraukiamas."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3060,14 +3092,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Nebuvo rasta „%s“ versija paketui „%s“"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Nepavyko rasti užduoties %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Nepavyko rasti paketo %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3117,9 +3149,9 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "Įdiegta %s"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
@@ -3132,9 +3164,9 @@ msgid "Removing %s"
 msgstr "Šalinamas %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "Visiškai pašalintas %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3153,9 +3185,9 @@ msgid "Directory '%s' missing"
 msgstr "Trūksta aplanko „%s“"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Nepavyko atverti failo %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3255,9 +3287,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Nepavyko užrakinti sąrašo aplanko"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3271,11 +3303,9 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Paketas %s nėra įdiegtas, todėl nebuvo pašalintas\n"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Praleidžiama jau parsiųsta byla „%s“\n"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "Nepavyko pašalinti %s"
@@ -3285,3 +3315,52 @@ msgstr ""
 
 #~ msgid "Reading file listing"
 #~ msgstr "Skaitomas failų sąrašas"
+
+#, fuzzy
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nepavyko atverti failo %s"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Nekorektiškas perrašymas %s eilutėje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "išskleidiklis"
+
+#, fuzzy
+#~| msgid "Could not open file %s"
+#~ msgid "Could not patch file"
+#~ msgstr "Nepavyko atverti failo %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Apdorojami %s trigeriai"
+
+#~ 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 ""
+#~ "Kadangi jūs paprašėte tik vienos operacijos, gan tikėtina, kad \n"
+#~ "paketas tiesiog negali būti įdiegiamas, ir turėtų būti užpildytas "
+#~ "klaidos\n"
+#~ "pranešimas apie šį paketą."
+
+#~ msgid "Line %d too long (max %u)"
+#~ msgstr "Eilutė %d per ilga (leidžiama %u simbolių)"
+
+#~ msgid "Apt Authentication issue"
+#~ msgstr "Apt autentikacijos problema"
+
+#~ msgid "Problem during package list update. "
+#~ msgstr "Įvyko klaida atnaujinant paketų sąrašą. "
diff --git a/po/mr.po b/po/mr.po
index a95a09153..eaedaa520 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,17 +7,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2011-06-29 22:38+0000\n"
-"Last-Translator: Sampada <Unknown>\n"
+"PO-Revision-Date: 2008-11-20 23:27+0530\n"
+"Last-Translator: Sampada <sampadanakhare@gmail.com>\n"
 "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India "
 "<janabhaaratii@cdacmumbai.in>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -29,28 +26,29 @@ msgid "Total package names: "
 msgstr "पॅकेजची सर्व नांवे: "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "पॅकेजची सर्व नांवे: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  सामान्य पॅकेजेस्: "
+msgstr " सामान्य पॅकेजेस्: "
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  शुध्द आभासी पॅकेजेस्: "
+msgstr " शुध्द आभासी पॅकेजेस्:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  एकमेव आभासी पॅकेजेस्: "
+msgstr " एकमेव आभासी पॅकेजेस्:"
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  मिश्रित आभासी पॅकेजेस्: "
+msgstr "मिश्रित आभासी पॅकेजेस्:"
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  हरवलेले/गहाळ: "
+msgstr " हरवलेले/गहाळ: "
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
@@ -62,15 +60,15 @@ msgstr "एकूण स्पष्ट विवरणे: "
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "एकूण निर्भरता: "
+msgstr "एकूण निर्भरता:"
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध: "
+msgstr "एकूण व्हीईआर/संचिका परस्पर संबंध:"
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
-msgstr "एकूण विव/संचिका परस्पर संबंध: "
+msgstr "एकूण विव/संचिका परस्पर संबंध:"
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
@@ -78,19 +76,19 @@ msgstr "एकूण मॅपींगस् तरतूद: "
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "एकूण एकत्रित अक्षरसंच: "
+msgstr "एकूण एकत्रित अक्षरसंच:"
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "एकूण परावलंबित आवृत्ती अवकाश: "
+msgstr "एकूण परावलंबित आवृत्ती अवकाश:"
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "एकूण दुर्लक्षित अवकाश: "
+msgstr "एकूण दुर्लक्षित अवकाश:"
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा): "
+msgstr "हिशेबात घेतलेली एकूण अवकाश(जागा):"
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -104,8 +102,9 @@ msgid "No packages found"
 msgstr "पॅकेजेस सापडले नाहीत"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "तुम्हाला फक्त एकच नमुना द्यावा लागेल"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -135,11 +134,11 @@ msgstr "(मिळाले नाही)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  अधिष्ठापित केले: "
+msgstr "अधिष्ठापित केले:"
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  उमेदवार: "
+msgstr "उमेदवार:"
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -147,12 +146,12 @@ msgstr "(कोणताच नाही)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  पॅकेज (पिन): "
+msgstr "पॅकेज (पिन):"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
 msgid "  Version table:"
-msgstr "  आवृत्ती कोष्टक:"
+msgstr "आवृत्ती कोष्टक:"
 
 #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
@@ -163,6 +162,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -198,19 +198,55 @@ 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 [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"
+"ऍप्टच्या द्वयंक कॅश संचिका कौशल्याने हाताळण्यासाठी, व त्यांमधील माहितीची विचारणा "
+"करण्यासाठी ऍप्ट -कॅश हे निम्नस्तरीय साधन आहे।\n"
+"\n"
+"आज्ञावली\n"
+"  add - उगमस्थान कॅशमध्ये एक पॅकेज संचिका मिळवा \n"
+"  gencaches - पॅकेज व उगमस्थान कॅश या दोघांची बांधणी करा\n"
+"  showpkg - एकमेव पॅकेजसाठी काही सामान्य माहिती दाखवा\n"
+"  showsrc -उगमस्थानाचा माहितीसंच दाखवा\n"
+"  stats - काही पायाभूत आकडेवारी दाखवा\n"
+"  dump - संपूर्ण संचिका थोडक्यात दाखवा\n"
+"  dumpavail - उपलब्ध संचिका stdout मधे छापा\n"
+"  unmet - पुरी न झालेली परावलंबने दाखवा\n"
+"  search - regex नमुन्यासाठी पॅकेजची यादी शोधा\n"
+"  show - पॅकेजसाठी वाचनीय माहितीसंच दाखवा\n"
+"  depends -पॅकेजसाठी संस्करणपूर्व परावलंबन माहिती दाखवा\n"
+"  rdepends -पॅकेजसाठी अतिपरावलंबन माहिती दाखवा\n"
+"  pkgnames - सर्व पॅकेजेससाठी यादी तयार करा\n"
+"  dotty - GraphViz साठी पॅकेज आलेख निर्माण करा\n"
+"  xvcg-xvcg साठी पॅकेज आलेख निर्माण करा\n"
+"  policy - धोरण निर्धारणे दाखवा\n"
+"\n"
+"पर्याय : \n"
+"-h -हा साह्याकारी मजकूर\n"
+"-p=? पॅकेज कॅश \n"
+"-s=? उगमस्थान कॅश \n"
+"-q-प्रगतीनिदर्शक अकार्यान्वित करा \n"
+"-i -न आढळलेल्या आज्ञेसाठी महत्त्वाचे विभाग दाखवा\n"
+"-c=? ही संरचना संचिका वाचा\n"
+"-o=? एखादा अहेतूक संरचना पर्याय निर्धारित करा उदा --o dir::cache=/tmp\n"
+"अधिक माहितीसाठी apt-cache(8) and apt.conf(5) ची मॅन्युअल पृष्ठे पहा \n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "या तबकडीला कृपया नाव द्या जसे डेबियन २ एलआरएल तबकडी १"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "कृपया तबकडी ड्राईव्हमध्ये ठेवून एंटर दाबा"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -259,7 +295,7 @@ msgstr ""
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "रिजेक्स कंपायलेशन त्रुटी -%s"
+msgstr "रिजेक्स कंपायलेशन त्रुटी -%s "
 
 #: cmdline/apt-get.cc:260
 msgid "The following packages have unmet dependencies:"
@@ -293,7 +329,7 @@ msgstr "पण ते संस्थापित होणार नाही"
 
 #: cmdline/apt-get.cc:369
 msgid " or"
-msgstr " किंवा"
+msgstr "किंवा"
 
 #: cmdline/apt-get.cc:398
 msgid "The following NEW packages will be installed:"
@@ -322,7 +358,7 @@ msgstr "पुढिल ठेवलेली पॅकेजेस बदलत
 #: cmdline/apt-get.cc:563
 #, c-format
 msgid "%s (due to %s) "
-msgstr "%s (च्या मुळे %s) "
+msgstr "%s (च्या मुळे %s)"
 
 #: cmdline/apt-get.cc:571
 msgid ""
@@ -335,17 +371,17 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले, "
+msgstr "%lu पुढे आवृत्तीकृत केले, %lu नव्याने संस्थापित केले,"
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu पुनर्संस्थापित केले, "
+msgstr "%lu पुनर्संस्थापित केले,"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu मागील आवृत्तीकृत केले, "
+msgstr "%lu मागील आवृत्तीकृत केले,"
 
 #: cmdline/apt-get.cc:610
 #, c-format
@@ -358,14 +394,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu संपूर्ण संस्थापित किंवा कायमची काढून टाकलेली नाही.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -374,11 +410,12 @@ msgstr "%s हे आभासी पॅकेज ह्यांच्याक
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
-msgstr " [संस्थापित केले]"
+msgstr "[संस्थापित केले]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "कंॅडिडेट आवृत्त्या"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -400,9 +437,9 @@ msgid "However the following packages replace it:"
 msgstr "तथापि खालील पॅकेजेस मध्ये बदल झाला:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "%s पॅकेजला संस्थापित कॅन्डिडेट नाही"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -411,19 +448,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -431,9 +468,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "%s सोडून देत आहे, ते आधिच संस्थापित केले आहे आणि पुढिल आवृत्ती निश्चित केलेली नाही.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -451,14 +488,14 @@ msgid "%s set to manually installed.\n"
 msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -466,11 +503,11 @@ msgstr "डिपेन्डन्सीज बरोबर/दुरूस्�
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
-msgstr " अयशस्वी/चूकीचे झाले."
+msgstr "अयशस्वी/चूकीचे झाले."
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
-msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे"
+msgstr "डिपेन्डन्सीज बरोबर करण्यास असमर्थ आहे "
 
 #: cmdline/apt-get.cc:1034
 msgid "Unable to minimize the upgrade set"
@@ -478,7 +515,7 @@ msgstr "आवृत्तीकृत संच कमीतकमी करण
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
-msgstr " झाले"
+msgstr "झाले"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
@@ -486,11 +523,11 @@ msgstr "हे बरोबर करण्यासाठी तुम्हा
 
 #: cmdline/apt-get.cc:1043
 msgid "Unmet dependencies. Try using -f."
-msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा"
+msgstr "अनमेट डिपेंडन्सीज.-f.वापरून प्रयत्न करा "
 
 #: cmdline/apt-get.cc:1068
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही!"
+msgstr "धोक्याची सूचना:खालील पॅकेजेस् प्रमाणित करु शकत नाही! "
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
@@ -498,7 +535,7 @@ msgstr "प्रमाणीकरणाची धोक्याची सू�
 
 #: cmdline/apt-get.cc:1079
 msgid "Install these packages without verification [y/N]? "
-msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]? "
+msgstr "पडताळून पाहिल्याशिवाय ही पॅकेजेस संस्थापित करायची का [हो/नाही]?"
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
@@ -644,9 +681,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -668,7 +705,7 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 "हूं,  AutoRemover ने काहीतरी नष्ट केल्याचे दिसतेय, खरेतर असे व्हायला नको\n"
-"कृपया apt कडे बग रिपोर्ट दाखल करा."
+"कृपया apt कडे बग रिपोर्ट दाखल करा. "
 
 #.
 #. if (Packages == 1)
@@ -689,27 +726,29 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
+msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
+msgstr[1] "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
+msgstr[1] "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -763,9 +802,9 @@ msgid "Couldn't find package %s"
 msgstr "%s पॅकेज सापडू शकले नाही"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -775,7 +814,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "पुढिल आवृत्तीची गणती करीत आहे... "
+msgstr "पुढिल आवृत्तीची गणती करीत आहे..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -906,11 +945,11 @@ msgid "%s has no build depends.\n"
 msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -925,18 +964,20 @@ msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s "
+"डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "%s पॅकेज न सापडल्याने %s साठी %s डिपेंडन्सी पूर्ण होऊ शकत नाही"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -950,18 +991,19 @@ msgstr "%s साठी बांधणी-डिपेंडन्सीज प
 
 #: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
-msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ"
+msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ "
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "%s (%s) ला जोडत आहे"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1006,6 +1048,46 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"वापर: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get हा पॅकेज डाऊनलोड आणि संस्थापित करण्यासाठी साधा आदेश रेखित\n"
+" संवादमंच आहे. नेहमी वापरले जाणारे आदेश म्हणजे अपडेट\n"
+"आणि संस्थापित करा\n"
+"\n"
+"आदेश:\n"
+"   update -पॅकेजच्या नव्या याद्यां प्राप्त करा\n"
+"   upgrade -आवृत्त्यांचे श्रेणिवर्धन करा\n"
+"   install -नवीन पॅकेजेस संस्थापित करा(pkg हे libc6 आहे आणि libc6.deb नव्हे)\n"
+"   remove -पॅकेजेस कायमची काढा\n"
+"   autoremove - वापरात नसलेली सर्व पॅकेजेस स्वयंचलितपणे कायमची काढा\n"
+"   purge - पॅकेजेस कायमची काढा व साफ करा\n"
+"   source -उगमस्थान अर्काईव्हज डाऊनलोड करा\n"
+"   build-dep - उगमस्थान पॅकेजेससाठी बांधणी-डिपेंडन्सी संरचित करा।\n"
+"   dist-upgrade - वितरण श्रेणिवर्धन, पहा apt-get(8)\n"
+"   dselect-upgrade -निवडी रहित करा\n"
+"   clean - डाऊनलोड केलेल्या अर्काईव्हज फाईल्स खोडून टाका\n"
+"   autoclean - डाऊनलोड केलेल्या जुन्या अर्काईव्हज फाईल्स खोडून टाका\n"
+"   check  -  डिपेन्डन्सीज तुटलेल्या नाहीत याची खात्री करा\n"
+"\n"
+"पर्याय:\n"
+"   -h     हा मदत मजकूर.\n"
+"   -q     नोंद करण्यासारखे आऊटपुट-प्रगती निदर्शक नाही\n"
+"   -qq   त्रुटींव्यतिरिक्त आऊटपुट नाही\n"
+"   -d   -  डाऊनलोड फक्त - अर्काईव्हज संस्थापित किंवा उघडू नका\n"
+"   -s      क्रिया नाही-\n"
+"   -y     सगळ्या प्रश्नांना 'हो' समजा. व प्रॉम्पट् करू नका.\n"
+"   -f      डिपेन्डन्सीज तुटलेल्या प्रणालीत द उरुस्ती करण्याचा प्रयत्न करा\n"
+"   -m     अर्काईव्हज सापडत नसतील तर पुढे जाण्याचा प्रयत्न करा\n"
+"   -u      पॅकेजच्या पुढिल आवृत्त्यांची यादी देखील दाखवा.\n"
+"   -b      मिळवल्यानंतर उगमस्थान पॅकेजची बांधणी करा\n"
+"   -V      व्हरबोस आवृत्ती क्रमांक दाखवा\n"
+"   -c=?-  ही संरचना फाईल वाचा\n"
+"   -o=?-  अनियंत्रित संरचना पर्याय निश्चित करा,उदा -o dir::cache=/tmp\n"
+"अधिक माहिती व पर्यायांसाठी apt-get(8), sources.list(5),आणि\n"
+" apt.conf(5)  पुस्तिका पाने पहा.\n"
+"         ह्या APT ला सुपर काऊ पॉवर्स आहेत\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1017,7 +1099,7 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "दाबा "
+msgstr "दाबा"
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
@@ -1025,11 +1107,11 @@ msgstr "मिळवा:"
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "आय.जी.एन. "
+msgstr "आय.जी.एन."
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "दोष इ.आर.आर. "
+msgstr "दोष इ.आर.आर."
 
 #: cmdline/acqprogress.cc:140
 #, c-format
@@ -1039,7 +1121,7 @@ msgstr "%s (%sB/s) मध्ये %sB मिळविला\n"
 #: cmdline/acqprogress.cc:230
 #, c-format
 msgid " [Working]"
-msgstr " [काम करत आहे]"
+msgstr "[काम करत आहे]"
 
 #: cmdline/acqprogress.cc:286
 #, c-format
@@ -1053,29 +1135,29 @@ msgstr ""
 "'%s' ड्राईव्ह मध्ये व एंटर कळ दाबा\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "पण ते संस्थापित केले नाही"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s ही आधीच नविन आवृत्ती आहे.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1084,14 +1166,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "%s साठी थांबलो पण ते तेथे नव्हते"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s  स्वहस्ते संस्थापित करायचे आहे.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "%s उघडण्यास असमर्थ"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1310,7 +1392,7 @@ msgstr "प्रश्न"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "जारी करण्यास करण्यास असमर्थ "
+msgstr "जारी करण्यास करण्यास असमर्थ"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1352,7 +1434,7 @@ msgstr "%s ला जोडत आहे"
 #: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "%s रिझॉल्व्ह होऊ शकत नाही"
+msgstr "%s रिझॉल्व्ह होऊ शकत नाही "
 
 #: methods/connect.cc:197
 #, c-format
@@ -1360,14 +1442,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "%s %s ला जोडण्यास असमर्थ:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1379,8 +1461,10 @@ msgid "At least one invalid signature was encountered."
 msgstr "किमान एक अवैध सही सापडली."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
+"सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1414,7 +1498,7 @@ msgstr "HTTP सर्व्हरने अवैध प्रत्त्य�
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले"
+msgstr "HTTP सर्व्हरने अवैध मजकूर-लांबी शीर्षक पाठविले "
 
 #: methods/http.cc:621
 msgid "The HTTP server sent an invalid Content-Range header"
@@ -1426,7 +1510,7 @@ msgstr "HTTP सर्व्हरने विस्तार तांत्�
 
 #: methods/http.cc:647
 msgid "Unknown date format"
-msgstr "अपरिचित दिनांक प्रकार/स्वरूप"
+msgstr "अपरिचित दिनांक प्रकार/स्वरूप "
 
 #: methods/http.cc:818
 msgid "Select failed"
@@ -1497,9 +1581,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "%s फाईल उघडता येत नाही"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1542,12 +1626,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "पुर्वी डाऊनलोड केलेल्या .deb संचयिका आपल्याला खोडून टाकायच्या आहेत का?"
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "काही त्रुटी ह्या उघडत असताना घडल्या.मी संरचित करणार आहे"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "पॅकेजेस जी संस्थापित झाली आहे.याचा निकाल दुप्पट त्रुटी म्हणून होऊ शकतो"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1566,7 +1652,7 @@ msgstr "उपलब्ध माहितीचे एकत्रीकरण
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s हे वैध डीईबी पॅकेज नाही"
+msgstr "%s हे वैध डीईबी पॅकेज नाही "
 
 #: cmdline/apt-extracttemplates.cc:236
 msgid ""
@@ -1595,7 +1681,7 @@ msgstr ""
 #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1281
 #, c-format
 msgid "Unable to write to %s"
-msgstr "%s मध्ये लिहिण्यास असमर्थ"
+msgstr "%s मध्ये लिहिण्यास असमर्थ "
 
 #: cmdline/apt-extracttemplates.cc:313
 msgid "Cannot get debconf version. Is debconf installed?"
@@ -1610,7 +1696,7 @@ msgstr "पॅकेजेसची विस्तारित यादी ख
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
-msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s"
+msgstr "त्रुटी प्रक्रिया मार्गदर्शिका%s "
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1726,10 +1812,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
+"DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, "
+"कृपया माहितीसंच काढून टाका आणि पुनर्निर्मित करा"
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1753,7 +1842,7 @@ msgstr "संकेतक घेण्यास असमर्थ"
 #: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ\n"
+msgstr "धोक्याची सूचना:%s संचयिका वाचण्यास असमर्थ \n"
 
 #: ftparchive/writer.cc:85
 #, c-format
@@ -1762,15 +1851,15 @@ msgstr "धो.सू.:%s स्टेट करण्यास असमर्�
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "E: "
+msgstr "E:"
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "धो.सू.: "
+msgstr "धो.सू.:"
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "ई: संचिकेला लागू होणाऱ्या चुका "
+msgstr "ई: संचिकेला लागू होणाऱ्या चुका"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
@@ -1789,7 +1878,7 @@ msgstr "%s उघडण्यास असमर्थ"
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " %s [%s] डी दुवा\n"
+msgstr "%s [%s] डी दुवा\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
@@ -1809,7 +1898,7 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ"
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " %sB हीट ची डिलींक मर्यादा\n"
+msgstr "%sB हीट ची डिलींक मर्यादा\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -1818,22 +1907,22 @@ msgstr "अर्काईव्ह ला पॅकेज जागा ना�
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s देखभालकर्ता हा %s आणि %s नाही\n"
+msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n"
 
 #: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
+msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n"
 
 #: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s ला द्वयंक ओव्हरराईड जागा नाही\n"
+msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -1845,19 +1934,19 @@ msgid "Unable to open %s"
 msgstr "%s उघडण्यास असमर्थ"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1893,7 +1982,7 @@ msgstr "अंतर्गत त्रुटी, %s तयार करण्�
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
-msgstr "IO ची उपक्रिया/संचिका असमर्थ"
+msgstr "IO ची उपक्रिया/संचिका असमर्थ "
 
 #: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
@@ -1907,9 +1996,10 @@ msgstr "%s दुवा मोकळा/सुटा करण्यास अ�
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ"
+msgstr "%s ला पुनर्नामांकन %s करण्यास असमर्थ "
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1922,6 +2012,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"उपयोग : ऍप्ट - एक्स्ट्रॅक्ट टेंप्लेट्स संचिका १[संचिका २..... ]\n"
+" \n"
+"ऍप्ट- एक्स्टॅक्ट टेंम्प्लेट्स हे संरचना व नमुन्याची माहिती काढण्याचे साधन आहे \n"
+"डेबियन पॅकेजेस मधून \n"
+"\n"
+"पर्याय : \n"
+" -h    हा साह्याकारी मजकूर \n"
+" -t     टेंप डिर निर्धारित करा \n"
+"  -c=?  ही संरचना संचिका वाचा \n"
+" -o=?  एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे-  -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1958,7 +2058,7 @@ msgstr "पाईप तयार करण्यास असमर्थ"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "exec gzip करण्यास असमर्थ "
+msgstr "exec gzip करण्यास असमर्थ"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -1982,9 +2082,9 @@ msgid "Error reading archive member header"
 msgstr "अर्काईव्ह मेंबर शीर्षक वाचण्यास त्रुटी"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "अयोग्य अर्काईव्ह मेंबर शीर्षक"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2116,22 +2216,24 @@ msgid "Can't mmap an empty file"
 msgstr "रिकामी फाईल mmap करता येणार नाही"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "%s साठी पाईप उघडता येत नाही"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "mmap चे %lu बाईटस् करता येणार नाहीत"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "%s उघडण्यास असमर्थ"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "जारी करण्यास करण्यास असमर्थ"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2228,7 +2330,7 @@ msgstr "रचनेच्या नियमांचा दोष %s:%u: ख�
 #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून  समाविष्ट"
+msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून  समाविष्ट "
 
 #: apt-pkg/contrib/configuration.cc:869
 #, c-format
@@ -2236,9 +2338,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2311,9 +2413,9 @@ msgid "Failed to stat the cdrom"
 msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "फाईल बंद करण्यात अडचण"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2362,9 +2464,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2382,9 +2484,9 @@ msgid "Could not open file %s"
 msgstr "%s फाईल उघडता येत नाही"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "%s साठी पाईप उघडता येत नाही"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2392,32 +2494,32 @@ msgstr "आयपीसी उपक्रिया तयार करण्य
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ "
+msgstr "दाबक(संकलितकर्ता) कर्यान्वित करण्यास असमर्थ"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "फाईल बंद करण्यात अडचण"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "संचिकेची syncing समस्या"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "फाईल अनलिंकिंग करण्यात अडचण"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2436,8 +2538,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल ही विजोड आवृत्ती आहे"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "पॅकेज अस्थाई स्मृतिकोष फाईल खराब झाली आहे"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2514,7 +2617,7 @@ msgstr "कंॅडिडेट आवृत्त्या"
 
 #: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
-msgstr "अवलंबित/विसंबून असलेले उत्पादन"
+msgstr "अवलंबित/विसंबून असलेले उत्पादन "
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
@@ -2541,54 +2644,54 @@ msgid "Unable to parse package file %s (2)"
 msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "%lu वाईट/व्यंग रेषा स्त्रोत सुची %s (यूआरआय) मध्ये"
+msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "%lu वाईट/व्यंग रेषा स्त्रोत सुची %s (डिआयएसटी) मध्ये"
+msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "%lu वाईट/व्यंग रेषा स्त्रोत सुची %s (यूआरआय पार्स) मध्ये"
+msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "%lu वाईट/व्यंग रेषा स्त्रोत सुची %s (absolute dist) मध्ये"
+msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "%lu वाईट/व्यंग रेषा स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये"
+msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:248
 #, c-format
@@ -2598,17 +2701,17 @@ msgstr "%s उघडत आहे"
 #: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "ओळ %u %s स्त्रोत सुचीमध्ये खूप लांब आहे."
+msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे."
 
 #: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "%u वाईट/व्यंग रेषा स्त्रोत सुची %s (प्रकार) मध्ये"
+msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा"
 
 #: apt-pkg/sourcelist.cc:289
 #, 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/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2618,9 +2721,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "%s फाईल उघडता येत नाही"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2658,25 +2761,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "अडचणी दूर करण्यास असमर्थ, तुम्ही तुटलेले पॅकेज घेतलेले आहे."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"काही अनुक्रमणिका संचयिका डाऊनलोड    करण्यास असमर्थ,त्या दुर्लक्षित झाल्या, किंवा "
+"त्याऐवजी जुन्या वापरल्या गेल्या."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "संचयिका यादीत %s पार्शल हरवले आहे."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "ऑर्काइव्ह संचयिका %spartial गायब आहे."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2693,7 +2799,7 @@ msgstr "%li ची %li संचिका पुन:प्राप्त कर
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
 msgid "The method driver %s could not be found."
-msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही."
+msgstr "%s कार्यपध्दतीचा ड्राइव्हर सापडू शकला नाही. "
 
 #: apt-pkg/acquire-worker.cc:161
 #, c-format
@@ -2712,12 +2818,12 @@ msgstr "'%s' पॅकेजींग प्रणाली सहाय्य�
 
 #: apt-pkg/init.cc:168
 msgid "Unable to determine a suitable packaging system type"
-msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ"
+msgstr "योग्य असा पॅकेजिंग प्रणाली प्रकार निश्चित करण्यास असमर्थ "
 
 #: apt-pkg/clean.cc:57
 #, c-format
 msgid "Unable to stat %s."
-msgstr "%s स्टॅट करण्यात असमर्थ."
+msgstr "%s स्टॅट करण्यात असमर्थ. "
 
 #: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
@@ -2743,9 +2849,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही "
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2770,9 +2876,9 @@ msgstr "अस्थायी स्मृतिकोष मध्ये वि
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2798,7 +2904,7 @@ msgstr ""
 #: apt-pkg/pkgcachegen.cc:523
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
-msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही"
+msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही "
 
 #: apt-pkg/pkgcachegen.cc:1092
 #, c-format
@@ -2840,9 +2946,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2880,7 +2986,7 @@ msgid ""
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 "मी %s पॅकेजकरीता संचिका शोधण्यास  समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते "
-"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे)"
+"स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) "
 
 #: apt-pkg/acquire-item.cc:1705
 #, c-format
@@ -2904,14 +3010,14 @@ msgid "Size mismatch"
 msgstr "आकार जुळतनाही"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "लक्षात घ्या,%s ऐवजी %s ची निवड करत आहे \n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2919,14 +3025,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "%s (1) पॅकेज फाईल पार्स करण्यात असमर्थ"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2944,12 +3050,12 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "ओळखत आहे.. "
+msgstr "ओळखत आहे.."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "ग्रहण केलेले नामदर्शक: %s\n"
+msgstr "ग्रहण केलेले नामदर्शक: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3019,7 +3125,7 @@ msgstr "नविन स्त्रोत सूची लिहित आह�
 
 #: apt-pkg/cdrom.cc:865
 msgid "Source list entries for this disc are:\n"
-msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत:\n"
+msgstr "ह्या डिस्क/चकती करिता स्त्रोत सूचीच्या प्रवेशिका आहेत: \n"
 
 #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
 #, c-format
@@ -3047,9 +3153,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "हॅश बेरीज जुळत नाही"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3058,9 +3164,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "संस्थापन खंडित करत आहे."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3073,14 +3179,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' साठी '%s' आवृत्ती सापडली नाही"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "%s कार्य सापडू शकले नाही"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "%s पॅकेज सापडू शकले नाही"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3145,9 +3251,9 @@ msgid "Removing %s"
 msgstr "%s काढून टाकत आहे"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "%s संपूर्ण काढून टाकले"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3166,9 +3272,9 @@ msgid "Directory '%s' missing"
 msgstr "'%s' संचयिका गहाळ आहे"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "%s फाईल उघडता येत नाही"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3178,7 +3284,7 @@ msgstr "%s तयार करित आहे"
 #: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Unpacking %s"
-msgstr "%s सुटे/मोकळे करीत आहे"
+msgstr "%s सुटे/मोकळे करीत आहे "
 
 #: apt-pkg/deb/dpkgpm.cc:950
 #, c-format
@@ -3268,9 +3374,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3284,82 +3390,201 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "%s संरचना फाईल उघडत आहे"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "%s क्रियेपासून चूक वाचा"
+#~ msgid "Failed to remove %s"
+#~ msgstr "%s कायमचे काढून टाकण्यास असमर्थ"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "%s साठी पाईप उघडता येत नाही"
+#~ msgid "Unable to create %s"
+#~ msgstr "%s तयार करण्यास असमर्थ"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "वैध नियंत्रण फाईल शोधण्यास असमर्थ"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "% sinfo स्टॅट करण्यास असमर्थ"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "%s मध्ये बदलता येत नाही"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "ऑफसेट %lu, MD5. पार्सिंग मध्ये त्रुटी"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "admin dir %sinfo असे बदलण्यास असमर्थ"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "आॅफसेट %lu, सद्यस्थिती फाईलमध्ये वाईट कॉन्फ फाईल भाग"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "पॅकेजचे नाव मिळवत असताना आंतरिक दोष/त्रुटी मिळाली"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "पॅकेज शोधण्यास असमर्थ: शिर्षक,आॅफसेट %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "फाईलचे लिस्टिंग वाचत आहे"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "pkg अस्थाई स्मृतीकोष प्रथम इनिशिअलाईज्ड केला पाहिजे"
+#~ 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'. जर तुम्ही ही फाईल रिस्टोअर करू शकला नाहीत.तर ती रिकामी करा आणि "
+#~ "लगेच ह्या सारखी आवृत्ती असणारे पॅकेज पुनर्संस्थापितकरा!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "डायव्हर्जन मिळवताना आंतरिक त्रुटी मिळाली"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "%sinfo/%s फाईल यादी वाचण्यास असमर्थ"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
+#~ msgid "Internal error getting a node"
+#~ msgstr "नोड मिळवताना आंतरिक त्रुटी मिळाली"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "%sdiversions ही डायव्हर्जन फाईल उघडण्यात असमर्थ"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "डायव्हर्जन फाईल खराब झाली आहे"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "%sdiversions ही डायव्हर्जन फाईल उघडण्यात असमर्थ"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "%s डायव्हर्जन फाईलमध्ये अवैध ओळ आहे:"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "नोड मिळवताना आंतरिक त्रुटी मिळाली"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "डायव्हर्जन मिळवताना आंतरिक त्रुटी मिळाली"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "%sinfo/%s फाईल यादी वाचण्यास असमर्थ"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "pkg अस्थाई स्मृतीकोष प्रथम इनिशिअलाईज्ड केला पाहिजे"
 
-#~ 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!"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "पॅकेज शोधण्यास असमर्थ: शिर्षक,आॅफसेट %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "आॅफसेट %lu, सद्यस्थिती फाईलमध्ये वाईट कॉन्फ फाईल भाग"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "ऑफसेट %lu, MD5. पार्सिंग मध्ये त्रुटी "
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "%s मध्ये बदलता येत नाही"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "वैध नियंत्रण फाईल शोधण्यास असमर्थ"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s साठी पाईप उघडता येत नाही"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s क्रियेपासून चूक वाचा"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "%u अक्षरांवर एक शीर्षक ओळ मिळाली"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "व्यंगीत/हिडीस दुर्लक्षित केले %s रेषा %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "असंकलितकर्ता "
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "%s (नविन पॅकेज) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "%s (वापरातील पॅकेज१) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "%s (NewFileDesc1) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "%s प्रक्रिया करीत असतांना दोष आढळून आला(वापरातील पॅकेज२)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "%s (नविन आवृत्ती १) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "%s(वापरातील पॅकेज३) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "%s (NewFileDesc2) वर प्रक्रिया सुरू असताना त्रुटी उद्भवली"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "%s (पॅकेज शोधतांना) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "%s (तरतूद/पुरवलेल्या संचिका जमा) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "आंतरिक त्रुटी, मेंबर शोधता येत नाही"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 #~ msgstr ""
-#~ "'%sinfo/%s'. जर तुम्ही ही फाईल रिस्टोअर करू शकला नाहीत.तर ती रिकामी करा आणि "
-#~ "लगेच ह्या सारखी आवृत्ती असणारे पॅकेज पुनर्संस्थापितकरा!"
+#~ "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे."
 
-#~ msgid "Reading file listing"
-#~ msgstr "फाईलचे लिस्टिंग वाचत आहे"
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "%s(नविन आवृती२) प्रक्रिया करीत असतांना दोष आढळून आला"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "पॅकेजचे नाव मिळवत असताना आंतरिक दोष/त्रुटी मिळाली"
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा "
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "admin dir %sinfo असे बदलण्यास असमर्थ"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे"
+#~ msgid "Could not patch file"
+#~ msgstr "फाईल पॅच करता आली नाही"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "% sinfo स्टॅट करण्यास असमर्थ"
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "%s तयार करण्यास असमर्थ"
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "%s कायमचे काढून टाकण्यास असमर्थ"
+#~ msgid "Processing triggers for %s"
+#~ msgstr "%s करिता ट्रिगर्स प्रक्रिया करत आहे"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamic MMap ला ज आगा कमी पडली"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "%s पॅकेज संस्थापित केलेले नाही,म्हणून काढले नाही\n"
+#~ 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"
+#~ "दोष आढाव्याची नोंद ठेवली पाहिजे."
+
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "ओळ %d खूप लांब (कमाल %d)"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "ओळ %d खूप लांब (कमाल %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "%s(नविन संचिका आवृती१) प्रक्रिया करीत असतांना दोष आढळून आला"
+
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "ग्रहण केलेले नामदर्शक: %s \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "%i पॅकेजेसची यादी/सूची , %i स्त्रोताची यादी/सूची आणि %i स्वाक्षऱ्या/सिगनेचर्स "
+#~ "सापडल्या \n"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा."
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "चुकले/असमर्थ निवड करा"
diff --git a/po/nb.po b/po/nb.po
index ee34cc38b..089bf67e0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,27 +1,26 @@
-# Norsk Bokmal translation of messages in APT.
-# The file is available under Gnu Public License version 2.
-# Get the license from http://www.gnu.org/licenses/gpl.txt
-# Copyright:
-# Lars Bahner <bahner@debian.org>, 2002-2003.
-# Axel Bojer <axelb@skolelinux.no>, 2003-2004.
-# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
-# Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.
+# Norsk Bokmal translation of messages in APT.

+# The file is available under Gnu Public License version 2.

+# Get the license from http://www.gnu.org/licenses/gpl.txt

+# Copyright:

+# Lars Bahner <bahner@debian.org>, 2002-2003.

+# Axel Bojer <axelb@skolelinux.no>, 2003-2004.

+# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.

+# Bjorn Steensrud <bjornst@powertech.no>, 2004.

+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.

 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:24+0000\n"
+"PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -168,6 +167,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert på %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,6 +203,43 @@ 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 ""
+"Bruk: apt-cache [valg] kommando\n"
+"      apt-cache [valg] add fil1 [fil2 ...]\n"
+"      apt-cache [valg] showpkg pakke1 [pakke2 ...]\n"
+"      apt-cache [valg] showsrc pakke1 [pakke2 ...]\n"
+"\n"
+"apt-cache er et lavnivå-verktøy, som brukes til å håndtere APT sine binære\n"
+"lagerfiler, og spørre dem om informasjon.\n"
+"\n"
+"Kommandoer:\n"
+"   add - Legg en fil til kildelageret\n"
+"   gencaches - Bygg lagrene for både pakke og kildekode\n"
+"   showpkg - Vis overordnet informasjon om en enkelt pakke\n"
+"   showsrc - Vis data om kildekoden\n"
+"   stats - Vis en enkel statistikk\n"
+"   dump - Vis fila med liste over tilgjengelige pakker i kompakt form\n"
+"   dumpavail - Send hele lista over tilgjengelige pakker til standard ut\n"
+"   unmet - Vis uinnfridde avhengighetsforhold\n"
+"   search - Søk i pakkelista etter et regulært uttrykkr\n"
+"   show - Vis et lesbart oppslag for pakken\n"
+"   showauto - Vis en liste med automatisk installerte pakker\n"
+"   depends - Vis rå informasjon om avhengighetsforholdene for pakken\n"
+"   rdepends - Vis informasjon om de reverserte avhengighetsforholdene for "
+"pakken\n"
+"   pkgnames - List alle pakkenavn på systemet\n"
+"   dotty - Lag pakke-grafer for GraphViz\n"
+"   xvcg - Lag pakke-grafer for xvcg\n"
+"   policy - Vis regelinnstillingerr\n"
+"\n"
+"Valg:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -p=? Pakkelageret.\n"
+"  -s=? Kildekodelageret.\n"
+"  -q   Ikke vis framdrift.\n"
+"  -i   Vis bare viktige avhengighetsforhold for kommandoen «unmet».\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+"Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -416,14 +453,14 @@ msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -464,9 +501,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -722,10 +759,11 @@ msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
 msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
+msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -836,12 +874,15 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Bruk:\n"
+"bzr get %s\n"
+"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -922,11 +963,11 @@ msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -943,18 +984,20 @@ msgstr ""
 "%s er for ny"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -971,15 +1014,16 @@ msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Kobler til %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1024,6 +1068,48 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Bruk: apt-get [valg] kommando\n"
+"      apt-get [valg] install|remove pakke1 [pakke2 ...]\n"
+"      apt-get [valg] source pakke1 [pakke2 ...]\n"
+"\n"
+"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja\n"
+"for å laste ned og installere pakker. De mest brukte kommandoene \n"
+"er «update» og «install».\n"
+"\n"
+"Kommandoer:\n"
+"   update - Hent nye pakkelister\n"
+"   upgrade - Utfør en oppgradering\n"
+"   install - Installér nye pakker (Pakke er «foo», ikke «foo.deb»)\n"
+"   remove - Fjern pakker\n"
+"   autoremove - Fjern alle automatisk ubrukte pakker\n"
+"   purge - Fjern og rydd opp etter pakker\n"
+"   source - Last ned kildekode fra arkivene\n"
+"   build-dep - Sett opp bygge-forutsetninger for kildekodepakker\n"
+"   dist-upgrade - Oppgradér utgave, les apt-get(8)\n"
+"   dselect-upgrade - Følg «dselect» sine anbefalinger\n"
+"   clean - Slett nedlastede arkivfiler\n"
+"   autoclean - Slett gamle nedlastede arkivfiler\n"
+"   check - Se etter om det finnes brutte avhengigheter\n"
+"   markauto - Merk de oppgitte pakkene som automatisk installert\n"
+"   unmarkauto - Merk de oppgitte pakkene som manuelt installert\n"
+"\n"
+"Valg:\n"
+"  -h  Denne hjelpteksten.\n"
+"  -q  Loggbar tilbakemelding - ikke vis framdrift\n"
+"  -qq Ingen tilbakemelding - bortsett fra feilmeldinger\n"
+"  -d  Bare nedlasting - IKKE installér eller pakk ut arkivfilene\n"
+"  -s  Simulering - bare simuler kommandoen\n"
+"  -y  Anta Ja til alle forespørsler uten å spørre\n"
+"  -f  Prøv å fortsette hvis integritetstesten mislykkes\n"
+"  -m  Prøv å fortsette når pakker mangler\n"
+"  -u  Vis liste med oppgraderte pakker\n"
+"  -b  Bygg pakken etter at kildekoden er lastet ned\n"
+"  -V  Vis fullstendige versjonsnummere\n"
+"  -c=? Les denne innstillingsfila\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
+"Les manualsiden apt-get(8), sources.list(5) og apt.conf(5)\n"
+"for mer informasjon og flere valg.\n"
+"                       Denne APT har kraften til en Superku.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1075,29 +1161,29 @@ msgstr ""
 "i «%s» og trykk «Enter»\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "men er ikke installert"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s satt til manuell installasjon.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s satt til automatisk installasjon.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s er allerede nyeste versjon.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s er allerede nyeste versjon.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1106,14 +1192,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s satt til manuell installasjon.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Klarte ikke å åpne %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1334,7 +1420,7 @@ msgstr "Spørring"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "Klarte ikke å starte "
+msgstr "Klarte ikke å starte"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1519,14 +1605,14 @@ msgstr "Klarer ikke å endre %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Ingen speilfil «%s» funnet "
+msgstr "Ingen speilfil «%s» funnet"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Ingen speilfil «%s» funnet"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1572,16 +1658,16 @@ msgstr "Trykk «Enter» og fortsett"
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
 
-# Note to translators: The following four messages belong together. It doesn't
-# matter where sentences start, but it has to fit in just these four lines, and
-# at only 80 characters per line, if possible.
+# Note to translators: The following four messages belong together. It doesn't

+# matter where sentences start, but it has to fit in just these four lines, and

+# at only 80 characters per line, if possible.

 #: dselect/install:101
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "Feil oppstod ved utpakkinga. Setter nå opp de installerte pakkene."
 
 #: dselect/install:102
 msgid "will be configured. This may result in duplicate errors"
-msgstr "Det kan lede til fordobling av feil eller feil forårsaket av"
+msgstr "Det kan lede til fordobling av feil eller feil forårsaket av "
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1799,15 +1885,15 @@ msgstr "A: Klarte ikke å få statusen på %s\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "F: "
+msgstr "F:"
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "A: "
+msgstr "A:"
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "F: Det er feil ved fila "
+msgstr "F: Det er feil ved fila"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
@@ -1860,7 +1946,7 @@ msgstr "  %s har ingen overstyringsoppføring\n"
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  %s-vedlikeholderen er %s, ikke %s\n"
+msgstr " %s-vedlikeholderen er %s, ikke %s\n"
 
 #: ftparchive/writer.cc:721
 #, c-format
@@ -1882,19 +1968,19 @@ msgid "Unable to open %s"
 msgstr "Klarte ikke å åpne %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Ugyldig overstyring %s linje %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Ugyldig overstyring %s linje %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Ugyldig overstyring %s linje %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1947,6 +2033,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Klarte ikke å endre navnet på %s til %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1959,6 +2046,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er et verktøy til å hente ut informasjon om "
+"innstillinger\n"
+"og maler fra debianpakker.\n"
+"\n"
+"Innstillinger:\n"
+"  -h   Denne hjelpeteksten\n"
+"  -t   Lag en midlertidig mappe\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2159,9 +2257,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Klarte ikke duplisere fildeskriptor %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Klarte ikke lage mmap av %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2436,17 +2534,17 @@ msgstr "Klarte ikke å opprette underprosessen IPC"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "Klarte ikke å kjøre komprimeringen "
+msgstr "Klarte ikke å kjøre komprimeringen"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2480,8 +2578,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Pakkens lagerfil er ødelagt"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2664,9 +2763,9 @@ msgstr ""
 "under APT::Immediate-Configure for detaljer. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Klarte ikke åpne fila «%s»"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2704,10 +2803,13 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
+"ble brukt isteden. "
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2818,9 +2920,9 @@ msgstr "Lageret har et uoverensstemmende versjonssystem"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Feil oppsto under behandling av %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2883,9 +2985,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Klarer ikke å fortolke Release-fila %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2988,12 +3090,12 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Indentifiserer.. "
+msgstr "Indentifiserer.."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Lagret merkelapp: %s\n"
+msgstr "Lagret merkelapp: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3339,104 +3441,233 @@ msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet, "
+msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Ikke låst"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Fikk en enkel hodelinje over %u tegn"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Hopper over den ikke-eksisterende fila %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Lesefeil fra %s-prosessen"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Klarte ikke å fjerne %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Klarte ikke å åpne rør for %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Klarte ikke å opprette %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Fant ingen gyldig kontrollfil"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Klarte ikke å få statusen på %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Klarte ikke å bytte til %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Infokatalogen og den midlertidige katalogen må være på det samme "
+#~ "filsystemet"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Feil ved tolking av MD5. Offset %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Klarte ikke å bytte til adminkatalogen %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Ødelagt «ConfFile»-del i statusfila. Offset %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Intern feil ved henting av pakkenavn"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Fant ikke «Package:»-linje, offset %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Les filliste"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Pakkelageret må klargjøres først"
+#~ 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 ""
+#~ "Klarte ikke å åpne listefila «%sinfo/%s». Dersom du ikke kan gjenopprette "
+#~ "denne fila, bør du opprette den som en tom fil og installere den samme "
+#~ "versjonen av pakken på nytt."
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Det oppsto en intern feil når avledningen ble lagt til"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Klarte ikke å lese listefila %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Ugyldig linje i avledningsfila: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Intern feil ved henting av node"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Klarte ikke å åpne avledningsfila %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Avledningsfila er ødelagt"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Klarte ikke å åpne avledningsfila %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Ugyldig linje i avledningsfila: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Intern feil ved henting av node"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Det oppsto en intern feil når avledningen ble lagt til"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Klarte ikke å lese listefila %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Pakkelageret må klargjøres først"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Fant ikke «Package:»-linje, offset %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Ødelagt «ConfFile»-del i statusfila. Offset %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Feil ved tolking av MD5. Offset %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Klarte ikke å bytte til %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Fant ingen gyldig kontrollfil"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Klarte ikke å åpne rør for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Lesefeil fra %s-prosessen"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Fikk en enkel hodelinje over %u tegn"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Ugyldig overstyring %s linje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Ugyldig overstyring %s linje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Ugyldig overstyring %s linje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekomprimering"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
 
 #~ 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!"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Klarte ikke å åpne listefila «%sinfo/%s». Dersom du ikke kan gjenopprette "
-#~ "denne fila, bør du opprette den som en tom fil og installere den samme "
-#~ "versjonen av pakken på nytt."
+#~ "Klarte ikke gjennomføre umiddelbar konfigurasjon av allerede utpakket "
+#~ "«%s». Se man 5 apt.conf under APT::Immediate-Configure for detaljer."
 
-#~ msgid "Reading file listing"
-#~ msgstr "Les filliste"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Feil oppsto under behandling av %s (NewPackage)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Intern feil ved henting av pakkenavn"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Feil oppsto under behandling av %s (UsePackage1)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Klarte ikke å bytte til adminkatalogen %sinfo"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileDesc1)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Infokatalogen og den midlertidige katalogen må være på det samme "
-#~ "filsystemet"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Feil oppsto under behandling av %s (UsePackage2)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Klarte ikke å få statusen på %sinfo"
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Klarte ikke å opprette %s"
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Feil oppsto under behandling av %s (NewVersion%d)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Klarte ikke å fjerne %s"
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Feil oppsto under behandling av %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Feil oppsto under behandling av %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Feil oppsto under behandling av %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Intern feil, fant ikke medlem"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Intern feil, gruppe «%s» har ingen installerbar pseudo-pakke"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Utgavefil har utgått, ignorerer %s (ugyldg siden %s)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Feil oppsto under behandling av %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Feil på %u i kildelista %s (selgers id)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Klarte ikke å slå opp i nøkkelring; «%s»"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Kunne ikke åpne fila %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Bruk «apt-get autoremove» for å fjerne dem."
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Behandler utløsere for %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Dynamisk MMap gikk tom for minne"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "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 ""
-#~ "Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
-#~ "Nåværende verdi: %lu. (man 5 apt.conf)"
+#~ "Ettersom du bare bestilte et enkelt inngrep er det overveiende "
+#~ "sannsynlig\n"
+#~ "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en "
+#~ "feilmelding."
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linje %d er for lang (maks %lu)"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Hopper over den ikke-eksisterende fila %s"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linje %d er for lang (maks %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Lagret merkelapp: %s \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr "Fant %i pakkeindekser, %i kildeindekser og %i signaturer\n"
+
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Utvalget mislykkes"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Fildatoen er endret %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Leser filliste"
+
+#~ msgid "Could not execute "
+#~ msgstr "Får ikke låst %s"
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr "Ukjent selger ID «%s» i linje %u i kildelista %s"
diff --git a/po/ne.po b/po/ne.po
index d537eb722..adbee0cb3 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,16 +7,15 @@ msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Shiva Prasad Pokharel <Unknown>\n"
+"PO-Revision-Date: 2006-06-12 14:35+0545\n"
+"Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
 "Language: ne\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2;plural=(n!=1)\n"
+"X-Generator: KBabel 1.10.2\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -25,71 +24,74 @@ msgstr "प्याकेज %s संस्करण %s संग एउटा
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "कूल प्याकेज नामहरू : "
+msgstr "कूल प्याकेज नामहरू :"
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "कूल प्याकेज नामहरू :"
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  सामान्य प्याकेजहरू: "
+msgstr "  सामान्य प्याकेजहरू:"
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  शुद्ध अवास्तविक प्याकेजहरू: "
+msgstr "शुद्ध अवास्तविक प्याकेजहरू:"
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  एकल अवास्तविक प्याकेजहरू: "
+msgstr "  एकल अवास्तविक प्याकेजहरू:"
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  मिश्रित अवास्तविक प्याकेजहरू: "
+msgstr "  मिश्रित अवास्तविक प्याकेजहरू:"
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  हराइरहेको: "
+msgstr "  हराइरहेको:"
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "कूल भिन्न संस्करणहरू: "
+msgstr "कूल भिन्न संस्करणहरू:"
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "कूल भिन्न संस्करणहरू:"
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "कूल निर्भरताहरू: "
+msgstr "कूल निर्भरताहरू:"
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
 msgstr "जम्मा ver/file सम्बन्धहरू: "
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "जम्मा ver/file सम्बन्धहरू: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "कूल उपलब्ध मानचित्रणहरू: "
+msgstr "कूल उपलब्ध मानचित्रणहरू:"
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू: "
+msgstr "कूल विश्वव्यापी स्ट्रिङ्गहरू:"
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "कूल निर्भरता संस्करण खाली ठाऊँ: "
+msgstr "कूल निर्भरता संस्करण खाली ठाऊँ:"
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "कूल शिथिल खाली ठाऊँ: "
+msgstr "कूल शिथिल खाली ठाऊँ:"
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "को लागि कूल खाली ठाऊँ लेखांकन: "
+msgstr "को लागि कूल खाली ठाऊँ लेखांकन:"
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -103,8 +105,9 @@ msgid "No packages found"
 msgstr "कुनै प्याकेजहरू फेला परेन"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "तपाईँले एउटा वास्तविक बान्की दिनुपर्छ"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -134,11 +137,11 @@ msgstr "(फेला परेन)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  स्थापना भयो: "
+msgstr "  स्थापना भयो:"
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  उमेद्वार: "
+msgstr "  उमेद्वार:"
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -146,7 +149,7 @@ msgstr "(कुनै पनि होइन)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  प्याकेज पिन: "
+msgstr "प्याकेज पिन:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -157,11 +160,12 @@ msgstr "  संस्करण तालिका:"
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s को लागि %s %s, %s %s मा कम्पाएल गरिएको छ\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -197,23 +201,60 @@ 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 [विकल्पहरू] फाइल १ थप्नुहोस् [फाइल २ ...]\n"
+"       apt-cache [विकल्पहरू] pkg pkg1 देखाउनुहोस् [pkg2 ...]\n"
+"       apt-cache [विकल्पहरू] src pkg1 देखाउनुहोस् [pkg2 ...]\n"
+"\n"
+"तिनीहरुबाट APT's बिनारी क्यास फाइलहरू, र क्वेरी सूचना मिलाउन प्रयोग गरिने apt-cache "
+"कम-स्तरको उपकरण हो\n"
+"\n"
+"\n"
+"आदेशहरू:\n"
+"   थप्नुहोस् - स्रोत क्यासमा प्याकेज फाइल थप्नुहोस्\n"
+"   gencaches - प्याकेज र स्रोत क्यास दुवै निर्माण गर्नुहोस्\n"
+"   showpkg - एकल प्याकेजको लागि केही सामान्य सूचनाहरू देखाउनुहोस्\n"
+"   showsrc - स्रोत रेकर्डहरू देखाउनुहोस्\n"
+"   stats - केही आधारभूत तथ्यांकशास्त्र हरू देखाउनुहोस्\n"
+"   dump - पुरै फाइल स्पष्ट रुपमा देखाउनुहोस्\n"
+"   dumpavail - stdout मा एउटा उपलब्ध फाइल मुद्रण गर्नुहोस्\n"
+"   unmet - नभेटिएका निर्भरताहरू देखाउनुहोस्\n"
+"   खोजी गर्नुहोस् - regex बान्कीको लागि प्याकेज सूचि खोजी गर्नुहोस्\n"
+"   देखाउनुहोस् - प्याकेजको लागि पढ्नयोग्य रेकर्ड देखाउनुहोस्\n"
+"   आधारित - प्याकेजको लागि कच्चा निर्भरता सूचना देखाउनुहोस्\n"
+"   rdepends - प्याकेजको लागि उल्टो निर्भरता सूचना देखाउनुहोस्\n"
+"   pkgnames - सबै प्याकेजहरुको नामहरू सूचिबद्ध गर्नुहोस्\n"
+"   dotty - GraphViz को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n"
+"   xvcg - xvcg को लागि प्याकेज ग्राफहरू सिर्जना गर्नुहोस्\n"
+"   नीति - नीति सेटिङ्गहरू देखाउनुहोस्\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ ।\n"
+"  -p=? प्याकेज क्यास ।\n"
+"  -s=? स्रोत क्यास ।\n"
+"  -q   प्रगति सूचक अक्षम गर्नुहोस् ।\n"
+"  -i   नभेटिएको आदेशको लागि महत्वपूर्ण deps देखाउनुहोस् ।\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन फाइल सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+"धेरै जानकारीकोप लागि apt-cache(8) र apt.conf(5) म्यानुल पृष्टहरू हेर्नुहोस्  ।\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "कृपया यो डिस्कको लागि नाम उपलब्ध गराउनुहोस्, जस्तै 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "कृपया ड्राइभमा डिस्क घुसाउनुहोस् र इन्टर थिच्नुहोस्"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् ।"
+msgstr "तपाईँको सेटमा बाँकी सि डि हरुको लागि यो प्रक्रिया फेरी गर्नुहोस् । "
 
 #: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
@@ -292,7 +333,7 @@ msgstr "तर यो स्थापना हुन गइरहेको छ�
 
 #: cmdline/apt-get.cc:369
 msgid " or"
-msgstr " वा"
+msgstr "वा"
 
 #: cmdline/apt-get.cc:398
 msgid "The following NEW packages will be installed:"
@@ -357,14 +398,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu पूर्णरुपले स्थापना भएन र हटाइएन ।\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -376,8 +417,9 @@ msgid " [Installed]"
 msgstr " [स्थापना भयो]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "उमेद्वार संस्करणहरू"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -399,9 +441,9 @@ msgid "However the following packages replace it:"
 msgstr "जे भए पनि निम्न प्याकेजहरूले यसलाई बदल्छ:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "प्याकेज %s संग कुनै स्थापना उमेद्वार छैन"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -410,19 +452,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -430,14 +472,14 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "%s फड्किदैछ, यो पहिल्यै स्थापना भयो र स्तरवृद्धि सेट भएको छैन ।\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "%s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
+msgstr " %s को पुन: स्थापना सम्भव छैन, यो डाउनलोड हुन सक्दैन ।\n"
 
 #: cmdline/apt-get.cc:839
 #, c-format
@@ -445,19 +487,19 @@ msgid "%s is already the newest version.\n"
 msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "तर %s स्थापना हुनुपर्यो"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -465,7 +507,7 @@ msgstr "निर्भरताहरू सुधार गरिदैछ..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
-msgstr " असफल भयो ।"
+msgstr "असफल भयो ।"
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
@@ -477,7 +519,7 @@ msgstr "स्तर वृद्धि सेटलाई न्यूनतम
 
 #: cmdline/apt-get.cc:1036
 msgid " Done"
-msgstr " काम भयो"
+msgstr "काम भयो"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
@@ -489,7 +531,7 @@ msgstr "नभेटिएका निर्भरताहरू । -f प्
 
 #: cmdline/apt-get.cc:1068
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन!"
+msgstr "चेतावनी: निम्न प्याकलेजहरू प्रणाणीकरण हुन सक्दैन! "
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
@@ -540,22 +582,22 @@ msgstr "संग्रहहरुको %sB प्राप्त गर्न
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "अनप्याक गरिसके पछि थप डिस्क खाली ठाउँको %sB प्रयोग हुनेछ ।\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
 #, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "%s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
+msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन"
 
 #: cmdline/apt-get.cc:1241
 #, c-format
@@ -642,9 +684,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -678,28 +720,30 @@ msgstr ""
 #.
 #: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
 msgid "The following information may help to resolve the situation:"
-msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ:"
+msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: "
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
+msgstr[1] "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -758,9 +802,9 @@ msgid "Couldn't find package %s"
 msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "तर %s स्थापना हुनुपर्यो"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -770,7 +814,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "स्तर वृद्धि गणना गरिदैछ... "
+msgstr "स्तर वृद्धि गणना गरिदैछ..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -782,7 +826,7 @@ msgstr "काम भयो"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
 msgid "Internal error, problem resolver broke stuff"
-msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो"
+msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो "
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
@@ -858,7 +902,7 @@ msgstr "केही संग्रह फड्काउन असफल भ�
 #: cmdline/apt-get.cc:2692
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "%s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
+msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n"
 
 #: cmdline/apt-get.cc:2704
 #, c-format
@@ -901,11 +945,11 @@ msgid "%s has no build depends.\n"
 msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -920,18 +964,20 @@ msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण "
+"आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन "
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "%s को लागि %s निर्भरता सन्तुष्ट हुन सकेन किनभने प्याकेज %s फेला पार्न सकिएन"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -941,22 +987,23 @@ msgstr "%s को लागि %s निर्भरता सन्तुष्
 #: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन ।"
+msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । "
 
 #: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
 msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "%s (%s) मा जडान गरिदैछ"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "समर्थित मोड्युलहरू:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1001,6 +1048,44 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"उपयोग: apt-get [विकल्पहरू] आदेश\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get डाउनलोड गर्न र प्याकेजहरू स्थापना गर्नको लागि साधारण आदेश लाइन इन्टरफेस हो ।\n"
+"बारम्बार प्रयोग भइरहने आदेशहरू अद्यावधिक र स्थापना हुन् ।\n"
+"\n"
+"\n"
+"आदेशहरू:\n"
+"   अद्यावधिक गर्नुहोस् - प्याकेजहरुको नयाँ सूचिहरू पुन:प्राप्त गर्नुहोस्\n"
+"   स्तर वृद्धि गर्नुहोस् - एउटा स्तरवृद्धि सम्पादन गर्नुहोस्\n"
+"   स्थापना गर्नुहोस् - नयाँ प्याकेजहरू स्थापना गर्नुहोस् (pkg libc6 हो libc6.deb होइन)\n"
+"   हटाउनुहोस् - प्याकेजहरू हटाउनुहोस्\n"
+"   स्रोत - स्रोत संग्रहहरू डाउनलोड गर्नुहोस्\n"
+"   build-dep - स्रोत प्याकेजहरुको लागि निर्माण-निर्भरताहरू कनफिगर गर्नुहोस्\n"
+"   dist-upgrade - स्तरवृद्धि वितरण गर्नुहोस्, apt-get(8) हेर्नुहोस्\n"
+"   dselect-upgrade - dselect चयनहरू पछ्याउनुहोस्\n"
+"   सफा गर्नुहोस् - डाउनलोड गरिएको संग्रह फाइलहरू मेट्नुहोस्\n"
+"   स्वचालित सफा - पुरानो डाउनलोड भएको संग्रह पाइलहरू मेट्नुहोस्\n"
+"   जाँच्नुहोस् - त्यहाँ कुनै भाँचिएका निर्भरताहरू छैन भन्ने रूजू गर्नुहोस्\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h  यो मद्दत पाठ.\n"
+"  -q  लगयोग्य निर्गात - कुनै प्रगति सूचि छैन\n"
+"  -qq त्रुटिहरुको लागि निर्गात बाहेक केही छैन\n"
+"  -d  डाउनलोड मात्र - संग्रहहरू स्थापना वा अनप्याक नगर्नुहोस्\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  सबै क्वेरीहरुलाई हो मान्नुहोस् र दूषित नबनाउनुहोस्\n"
+"  -f  यदि पूर्णरुपले जाँच असफल भयो भने निरन्तरता दिने प्रयत्न गर्नुहोस्\n"
+"  -m  यदि संग्रहहरु स्थानियकरण योग्य छैन भने निरन्तरता दिने प्रयत्न दिनुहोस्\n"
+"  -u  स्तर वृद्धि प्याकेजहरुको सूचि राम्रो संग देखाउनुहोस्\n"
+"  -b  यसलाई तानिसके पछि स्रोत प्याकेज निर्माण गर्नुहोस्\n"
+"  -V  भरबोस संस्करण नम्बरहरू देखाउनुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
+"धेरै सूचना र विकल्पको लागि apt-get(8), sources.list(5) र apt.conf(5) manual\n"
+"pages हेर्नुहोस् ।\n"
+"                       APT संग सुपर काउ शक्तिहरू छ ।\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1012,7 +1097,7 @@ msgstr ""
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "हान्नुहोस् "
+msgstr "हान्नुहोस्"
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
@@ -1048,45 +1133,45 @@ msgstr ""
 "र इन्टर थिच्नुहोस्\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "तर यो स्थापना भएन"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "तर %s स्थापना हुनुपर्यो"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "तर %s स्थापना हुनुपर्यो"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s पहिल्यै नयाँ संस्करण हो ।\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "%s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
+msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "तर %s स्थापना हुनुपर्यो"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "%s खोल्न असफल"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1142,7 +1227,7 @@ msgstr "डिस्क फेला परेन ।"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
-msgstr "फाइल फेला परेन"
+msgstr "फाइल फेला परेन "
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
@@ -1305,7 +1390,7 @@ msgstr "क्वेरी"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "आह्वान गर्न असक्षम भयो "
+msgstr "आह्वान गर्न असक्षम भयो"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1325,7 +1410,7 @@ msgstr "%s (f=%u t=%u p=%u) को लागि सकेट सिर्जन�
 #: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "%s:%s (%s) मा जडान सुरुवात गर्न सकेन"
+msgstr " %s:%s (%s) मा जडान सुरुवात गर्न सकेन"
 
 #: methods/connect.cc:107
 #, c-format
@@ -1335,7 +1420,7 @@ msgstr "%s:%s (%s) मा जडान गर्न सकिएन, जडा�
 #: methods/connect.cc:125
 #, 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
@@ -1355,14 +1440,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "'%s' हल गर्दा अस्थायी असफल"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "%s %s मा जडान गर्न असफल भयो:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1374,8 +1459,9 @@ msgid "At least one invalid signature was encountered."
 msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।"
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
+msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1492,9 +1578,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "फाइल %s खोल्न सकिएन"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1537,12 +1623,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "अनप्याक गर्दा केही त्रुटिहरू देखा पर्यो । म कनफिगर गर्न गइरहेको छु"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "स्थापना भएको प्याकेजहरू । यसले नक्कली त्रुटिहरुमा नतिजा गर्न सक्छ"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1591,11 +1679,11 @@ msgstr ""
 #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1281
 #, c-format
 msgid "Unable to write to %s"
-msgstr "%s मा लेख्न असक्षम"
+msgstr " %s मा लेख्न असक्षम"
 
 #: cmdline/apt-extracttemplates.cc:313
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ?"
+msgstr " debconf संस्करण प्राप्त गर्न सकिएन । के debconf स्थापना भयो ? "
 
 #: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
@@ -1738,7 +1826,7 @@ msgstr "DB फाइल %s असक्षम भयो: %s"
 #: apt-inst/extract.cc:210
 #, c-format
 msgid "Failed to stat %s"
-msgstr "%s स्थिर गर्न असफल"
+msgstr " %s स्थिर गर्न असफल"
 
 #: ftparchive/cachedb.cc:249
 msgid "Archive has no control record"
@@ -1768,7 +1856,7 @@ msgstr "W: "
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस् "
+msgstr "E: फाइलमा त्रुटिहरू लागू गर्नुहोस्"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
@@ -1807,7 +1895,7 @@ msgstr "*** %s मा %s लिङ्क असफल भयो"
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " यस %sB हिटको डि लिङ्क सिमा।\n"
+msgstr "यस %sB हिटको डि लिङ्क सिमा।\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -1816,7 +1904,7 @@ msgstr "संग्रह संग कुनै प्याकेज फा�
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
@@ -1824,14 +1912,14 @@ msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s संभारकर्ता %s हो %s होइन\n"
 
 #: ftparchive/writer.cc:721
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no source override entry\n"
-msgstr ""
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
 #: ftparchive/writer.cc:725
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr ""
+msgstr "   %s संग कुनै अधिलेखन प्रविष्टि छैन\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -1843,19 +1931,19 @@ msgid "Unable to open %s"
 msgstr "%s खोल्न असफल"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1905,9 +1993,10 @@ msgstr "समस्या अनलिङ्क भइरहेछ %s"
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "%s मा  %s  पुन:नामकरण असफल भयो"
+msgstr " %s मा  %s  पुन:नामकरण असफल भयो"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1920,6 +2009,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"उपयोग: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+" apt-extracttemplates डवियन प्याकेजहरुबाट कनफिगरेसन र टेम्प्लेट सूचना झिक्ने उपकरण हो\n"
+"\n"
+"\n"
+"विकल्पहरू:\n"
+"  -h   यो मद्दत पाठ\n"
+"  -t   टेम्प्लेट डाइरेक्ट्री सेट गर्नुहोस्\n"
+"  -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n"
+"  -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1955,7 +2054,7 @@ msgstr "पाइपहरू सिर्जना गर्न असफल"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "gzip कार्यन्वयन गर्न असफल "
+msgstr "gzip कार्यन्वयन गर्न असफल"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -1976,12 +2075,12 @@ msgstr "अवैध संग्रह हस्ताक्षर"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
-msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि"
+msgstr "संग्रह सदस्य हेडर पढ्दा त्रुटि "
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "अवैध संग्रह सदस्य हेडर"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2039,7 +2138,7 @@ 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
@@ -2049,7 +2148,7 @@ msgstr "एक भन्दा बढी %s अनप्याक गरिद�
 #: apt-inst/extract.cc:137
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "डाइरेक्ट्री %s फेरियो"
+msgstr "डाइरेक्ट्री %s फेरियो "
 
 #: apt-inst/extract.cc:147
 #, c-format
@@ -2076,7 +2175,7 @@ msgstr "बाटो अति लामो छ"
 #: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "%s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
+msgstr " %s को लागि संस्करन बिना अधिलेखन प्याकेज मेल खायो"
 
 #: apt-inst/extract.cc:432
 #, c-format
@@ -2095,9 +2194,9 @@ msgstr "यो वैध DEB संग्रह होइन, '%s' सदस्�
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
+msgstr "यो वैध DEB संग्रह होइन, यो संग '%s' वा '%s' सदस्य छैन"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2113,22 +2212,24 @@ msgid "Can't mmap an empty file"
 msgstr "एउटा खाली फाइल mmap बनाउन सकिएन"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "%s को लागि पाइप खोल्न सकिएन"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "%s खोल्न असफल"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "आह्वान गर्न असक्षम भयो"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2136,8 +2237,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu बाइटहरुको mmap बनाउन सकिएन"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "फाइल %s लेख्न असफल भयो"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2233,9 +2335,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2308,9 +2410,9 @@ msgid "Failed to stat the cdrom"
 msgstr "सिडी रोम स्थिर गर्न असफल भयो"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "फाइल बन्द गर्दा समस्या"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2359,9 +2461,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2379,9 +2481,9 @@ msgid "Could not open file %s"
 msgstr "फाइल %s खोल्न सकिएन"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "%s को लागि पाइप खोल्न सकिएन"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2389,32 +2491,32 @@ msgstr "सहायक प्रक्रिया IPC सिर्जना �
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो "
+msgstr "सङ्कुचनकर्ता कार्यान्वयन गर्न असफल भयो"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "फाइल बन्द गर्दा समस्या"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "फाइल गुप्तिकरण गर्दा समस्या"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "फाइल अनलिङ्क गर्दा समस्या"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2426,15 +2528,16 @@ msgstr "खाली प्याकेज क्यास"
 
 #: apt-pkg/pkgcache.cc:154
 msgid "The package cache file is corrupted"
-msgstr "प्याकेज क्यास फाइल दूषित भयो"
+msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
 #: apt-pkg/pkgcache.cc:159
 msgid "The package cache file is an incompatible version"
 msgstr "प्याकेज क्यास फाइल एउटा अमिल्दो संस्करण हो"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "प्याकेज क्यास फाइल दूषित भयो "
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2514,18 +2617,19 @@ msgid "Dependency generation"
 msgstr "निर्भरता सिर्जना"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "उपलब्ध सूचना गाँभिदैछ"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "%s खोल्न असफल"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "फाइल %s लेख्न असफल भयो"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2538,29 +2642,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2615,9 +2719,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "फाइल %s खोल्न सकिएन"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2654,25 +2758,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "समस्याहरू सुधार्न असक्षम भयो, तपाईँले प्याकेजहरु भाँच्नुभयो ।"
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"केही अनुक्रमणिका फाइलहरू डाउनलोड गर्न असफल भयो, तिनीहरू उपेक्षित भए, वा सट्टामा पुरानो "
+"एउटा प्रयोग गरियो ।"
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "आंशिक संग्रह डाइरेक्ट्री %s हराइरहेछ ।"
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2699,7 +2806,7 @@ msgstr "विधि %s सही रुपले सुरू हुन सक�
 #: apt-pkg/acquire-worker.cc:440
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् ।"
+msgstr "कृपया डिस्क लेबुल: '%s' ड्राइभ '%s'मा घुसउनुहोस् र इन्टर थिच्नुहोस् । "
 
 #: apt-pkg/init.cc:152
 #, c-format
@@ -2739,14 +2846,14 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन"
 
 #: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "पिन टाइप %s बुझ्न सकिएन"
+msgstr "पिन टाइप %s बुझ्न सकिएन "
 
 #: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
@@ -2766,25 +2873,26 @@ msgstr "क्यास संग एउटा नमिल्दो संस�
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो ।"
+msgstr "वाऊ, APT ले सक्षम गरेको प्याकेज नामहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
 #: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो ।"
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "वाऊ, APT ले सक्षम गरेको संस्करणहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो ।"
+msgstr "वाऊ, APT ले सक्षम गरेको निर्भरताहरुको नम्बरलाई तपाईँले उछिन्नुभयो । "
 
 #: apt-pkg/pkgcachegen.cc:523
 #, c-format
@@ -2794,7 +2902,7 @@ msgstr "फाइल निर्भरताहरू प्रक्रिय�
 #: apt-pkg/pkgcachegen.cc:1092
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन"
+msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन "
 
 #: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
 #: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
@@ -2820,8 +2928,9 @@ msgstr "MD5Sum मेल भएन"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "MD5Sum मेल भएन"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2831,9 +2940,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2871,7 +2980,7 @@ msgid ""
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज "
-"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले)"
+"निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) "
 
 #: apt-pkg/acquire-item.cc:1705
 #, c-format
@@ -2893,14 +3002,14 @@ msgid "Size mismatch"
 msgstr "साइज मेल खाएन"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "द्रष्टब्य, %s को सट्टा  %s चयन भइरहेछ\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2908,14 +3017,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (१)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2933,16 +3042,17 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "परिचय गराइदैछ.. "
+msgstr "परिचय गराइदैछ.."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "लेबुल भण्डारण गर्नुहोस्:%s\n"
+msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "सिडी रोम अनमाउन्ट गरिदैछ..."
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -2966,11 +3076,11 @@ msgid "Scanning disc for index files..\n"
 msgstr "अनुक्रमणिका फाइलहरुको लागि डिस्क स्क्यान गरिदैछ...\n"
 
 #: apt-pkg/cdrom.cc:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
-msgstr ""
+msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
@@ -2979,9 +3089,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:782
-#, c-format
+#, fuzzy, c-format
 msgid "Found label '%s'\n"
-msgstr ""
+msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3034,9 +3144,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "MD5Sum मेल भएन"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3045,29 +3155,29 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "स्थापना परित्याग गरिदैछ ।"
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "'%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
+msgstr " '%s' को लागि '%s' निष्काशन फेला पार्न सकिएन"
 
 #: apt-pkg/cacheset.cc:406
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "'%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
+msgstr " '%s' को लागि '%s' संस्करण फेला पार्न सकिएन"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "प्याकेज फेला पार्न सकिएन  %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3117,24 +3227,24 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr " %s स्थापना भयो"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Configuring %s"
-msgstr "%s कनफिगर गरिदैछ"
+msgstr " %s कनफिगर गरिदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Removing %s"
-msgstr "%s हटाइदैछ"
+msgstr " %s हटाइदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr " %s पूर्ण रुपले हट्यो"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3148,54 +3258,54 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "आंशिक सूचिहरुको डाइरेक्ट्री %s हराइरहेछ ।"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "फाइल %s खोल्न सकिएन"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
 msgid "Preparing %s"
-msgstr "%s तयार गरिदैछ"
+msgstr " %s तयार गरिदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Unpacking %s"
-msgstr "%s अनप्याक गरिदैछ"
+msgstr " %s अनप्याक गरिदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:950
 #, c-format
 msgid "Preparing to configure %s"
-msgstr "%s कनफिगर गर्न तयार गरिदैछ"
+msgstr " %s कनफिगर गर्न तयार गरिदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Installed %s"
-msgstr "%s स्थापना भयो"
+msgstr " %s स्थापना भयो"
 
 #: apt-pkg/deb/dpkgpm.cc:957
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr "%s हटाउन तयार गरिदैछ"
+msgstr " %s हटाउन तयार गरिदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removed %s"
-msgstr "%s हट्यो"
+msgstr " %s हट्यो"
 
 #: apt-pkg/deb/dpkgpm.cc:964
 #, c-format
 msgid "Preparing to completely remove %s"
-msgstr "%s पूर्ण रुपले हटाउन तयार गरिदैछ"
+msgstr " %s पूर्ण रुपले हटाउन तयार गरिदैछ"
 
 #: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Completely removed %s"
-msgstr "%s पूर्ण रुपले हट्यो"
+msgstr " %s पूर्ण रुपले हट्यो"
 
 #: apt-pkg/deb/dpkgpm.cc:1208
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
@@ -3255,9 +3365,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3271,79 +3381,202 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "%u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "कनफिगरेसन फाइल खोलिदैछ %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस्"
+#~ msgid "Failed to remove %s"
+#~ msgstr "%s लाई फेरी सार्न असफल भयो"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "%s को लागि पाइप खोल्न सकिएन"
+#~ msgid "Unable to create %s"
+#~ msgstr "%s सिर्जना गर्न असफल भयो"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "वैध नियन्त्रण फाइल स्थित गर्नु असफल भयो"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "%sinfo स्थिर गर्न असफल भयो"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "%s मा परिवर्तन गर्न सकिदैन"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "MD5 पद वर्णन गर्दा त्रुटि । अफसेट %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "प्रशासनिक डाइरेक्ट्री %sinfo मा परिवर्तन गर्न असफल भयो"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "वस्तु स्थिति फाइलमा खराब कनफिग फाइल । अफसेट %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "प्याकेज नाम प्राप्त गर्दा आन्तरिक त्रुटि"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "प्याकेज फेला पार्न असफल भयो: हेडर, अफसेट %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "फाइल सूचि पढिदैछ"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "pkg क्यास पहिले सुरुवात हुनुपर्छ"
+#~ 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' खोल्न असफल भयो । यदि तपाईँ यो फाइल पुन:भण्डारण गर्नु "
+#~ "सक्नुहुन्न भने यसलाई खाली गर्नुहोस् र तुरुन्तै प्याकेजको उही संस्करण पुन-स्थापना गर्नुहोस् !"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "आन्तरिक त्रुटिले मोड थपिरहेछ"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "सूचि फाइल %sinfo/%s पढ्न असफल भयो"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "नोड प्राप्त गर्दा आन्तरिक त्रुटि"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "घुमाउरो फाइल %sdiversions खोल्न असफल भयो"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "घुमाउरो फाइल दूषित भयो"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "घुमाउरो फाइल %sdiversions खोल्न असफल भयो"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "घुमाउरो फाइलमा अवैध लाइन:%s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "नोड प्राप्त गर्दा आन्तरिक त्रुटि"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "आन्तरिक त्रुटिले मोड थपिरहेछ"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "सूचि फाइल %sinfo/%s पढ्न असफल भयो"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "pkg क्यास पहिले सुरुवात हुनुपर्छ"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "प्याकेज फेला पार्न असफल भयो: हेडर, अफसेट %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "वस्तु स्थिति फाइलमा खराब कनफिग फाइल । अफसेट %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "MD5 पद वर्णन गर्दा त्रुटि । अफसेट %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "%s मा परिवर्तन गर्न सकिदैन"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "वैध नियन्त्रण फाइल स्थित गर्नु असफल भयो"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "%s को लागि पाइप खोल्न सकिएन"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "%s प्रक्रियाबाट त्रुटि पढ्नुहोस् "
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr " %u chars माथि एकल हेडर लाइन प्राप्त गर्नुहोस्"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #१"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #२"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "वैरुप्य गरिएको अधिलेखन  %s रेखा %lu #३"
+
+#~ msgid "decompressor"
+#~ msgstr "सङ्कुचनविहिन कर्ता"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन "
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ प्याकेज)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज १ प्रयोग गर्नुहोस्)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज २ प्रयोग गर्नुहोस्)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण १)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (प्याकेज ३ प्रयोग गर्नुहोस्)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (pkg फेला पार्नुहोस् )"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (संकलन फाइलले उपलब्ध गर्दछ)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "आन्तरिक त्रुटि, सदस्य तोक्न सकिदैन"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ संस्करण २)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "फाइल %s खोल्न सकिएन"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "डाइरेक्ट्री %s प्रक्रिया गर्दा त्रुटि"
 
 #~ 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!"
+#~ "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 ""
-#~ "सूचि फाइल '%sinfo/%s' खोल्न असफल भयो । यदि तपाईँ यो फाइल पुन:भण्डारण गर्नु "
-#~ "सक्नुहुन्न भने यसलाई खाली गर्नुहोस् र तुरुन्तै प्याकेजको उही संस्करण पुन-स्थापना गर्नुहोस् !"
+#~ "तपाईँले एकल सञ्चालन मात्र अनुरोध गरे पछि\n"
+#~ " यो प्याकेज साधरण तरिकाले नितान्त  स्थापनायोग्य देखिदैन र त्यो प्याकेज विरुद्धको\n"
+#~ " बग प्रतिवेदन भरिनेछ ।"
 
-#~ msgid "Reading file listing"
-#~ msgstr "फाइल सूचि पढिदैछ"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "लाइन %d अति लामो छ (अधिक्तम %d)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "प्याकेज नाम प्राप्त गर्दा आन्तरिक त्रुटि"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "लाइन %d अति लामो छ (अधिक्तम %d)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "प्रशासनिक डाइरेक्ट्री %sinfo मा परिवर्तन गर्न असफल भयो"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr " %s प्रक्रिया गर्दा त्रुटि देखा पर्यो (नयाँ फाइल संस्करण १)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "%sinfo स्थिर गर्न असफल भयो"
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "लेबुल भण्डारण गर्नुहोस्:%s \n"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "%s सिर्जना गर्न असफल भयो"
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr " %i प्याकेज अनुक्रमणिकाहरू, %i स्रोत अनुक्रमणिका र %i  हस्ताक्षरहरू फेला परे\n"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "%s लाई फेरी सार्न असफल भयो"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "असफल चयन गर्नुहोस्"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "प्याकेज %s स्थापना भएन, त्यसैले हटेन\n"
+#~ msgid "File date has changed %s"
+#~ msgstr "फाइल डेटाले %s परिवर्तन गर्यो"
diff --git a/po/nl.po b/po/nl.po
index 95d72ee47..3db8d3224 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,29 +5,26 @@
 # Jochem Berends <j@jochem.net>, 2002.
 # Wannes Soenen <wannes@wannes.cjb.net>, 2002.
 # Frans Pop <elendil@planet.nl>, 2010.
-# Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
+# Jeroen Schot <schot@a-eskwadraat.nl>, 2011. 
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.15.9\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Frans Pop <Unknown>\n"
+"PO-Revision-Date: 2011-12-05 17:10+0100\n"
+"Last-Translator: Jeroen Schot <schot@a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr ""
-"Pakket %s versie %s heeft een afhankelijkheid waaraan niet is voldaan:\n"
+msgstr "Pakket %s versie %s heeft een niet-voldane vereiste:\n"
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
@@ -43,7 +40,7 @@ msgstr "  Normale pakketten: "
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Zuiver virtuele pakketten: "
+msgstr " Zuiver virtuele pakketten: "
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
@@ -168,6 +165,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s voor %s gecompileerd op %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -203,6 +201,42 @@ 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 ""
+"Gebruik: apt-cache [opties] opdracht\n"
+"         apt-cache [opties] add bestand1 [bestand2 ...]\n"
+"         apt-cache [opties] showpkg pakket1 [pakket2 ...]\n"
+"         apt-cache [opties] showsrc pakket1 [pakket2 ...]\n"
+"\n"
+"apt-cache is een basaal hulpmiddel waarmee u de binaire cachebestanden\n"
+"van APT kunt manipuleren en informatie daaruit kunt opvragen.\n"
+"\n"
+"Opdrachten:\n"
+"   add - Voeg een pakketbestand toe aan de broncache.\n"
+"   gencaches - Bouw zowel de pakket- als de broncache.\n"
+"   showpkg - Toon algemene informatie over een enkel pakket.\n"
+"   showsrc - Toon bronrecords.\n"
+"   stats - Toon enkele basisstatistieken.\n"
+"   dump - Toon het gehele bestand in een compacte vorm.\n"
+"   dumpavail - Print een beschikbaarheidsbestand op de standaarduitvoer.\n"
+"   unmet - Toon niet-voldane vereisten.\n"
+"   search - Toon lijst met pakketten die met regexpatroon overeenkomen.\n"
+"   show - Toon een leesbaar overzicht voor het pakket.\n"
+"   showauto - Toon een lijst van automatisch geïnstalleerde pakketten.\n"
+"   depends - Toon de afhankelijkheden van een pakket.\n"
+"   rdepends - Toon de pakketten die afhankelijk zijn van een pakket.\n"
+"   pkgnames - Toon de namen van alle pakketten op het systeem.\n"
+"   dotty - Genereer pakketgrafen voor GraphViz.\n"
+"   xvcg - Genereer pakketgrafen voor xvcg.\n"
+"   policy - Toon beleidsinstellingen.\n"
+"\n"
+"Opties:\n"
+"  -h   Deze hulptekst.\n"
+"  -p=? De pakketcache.\n"
+"  -s=? De broncache.\n"
+"  -q   Voortgangsindicator uitschakelen.\n"
+"  -i   Toon alleen belangrijke vereisten voor de 'unmet'-opdracht.\n"
+"  -c=? Lees dit configuratiebestand.\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp.\n"
+"Zie de man-pagina's van apt-cache(8) en apt.conf(5) voor meer informatie.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -386,7 +420,7 @@ msgstr " [Geïnstalleerd]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [Niet de kandidaat-versie]"
+msgstr "[Niet de kandidaat-versie]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -419,14 +453,14 @@ msgstr "Virtuele pakketten zoals '%s' kunnen niet worden verwijderd\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -469,9 +503,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Geselecteerde versie '%s' (%s) voor '%s' vanwege '%s'\n"
+msgstr "Versie '%s' (%s) geselecteerd voor '%s'\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -729,10 +763,11 @@ msgstr[1] ""
 "%lu pakketten zijn automatisch geïnstalleerd en zijn niet langer nodig.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "U kunt deze verwijderen via 'apt-get autoremove'."
+msgstr[1] "U kunt deze verwijderen via 'apt-get autoremove'."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -847,12 +882,16 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Gebruik:\n"
+"bzr get %s\n"
+"om de nieuwste (mogelijk nog niet uit uitgebrachte) versie van het pakket op "
+"te halen.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -935,11 +974,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s heeft geen bouwvereisten.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
+"onvindbaar is"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -958,18 +999,22 @@ msgstr ""
 "is te nieuw"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s "
+"onvindbaar is"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -986,15 +1031,16 @@ msgid "Failed to process build dependencies"
 msgstr "Verwerken van de bouwvereisten is mislukt"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Changelog voor %s (%s)"
+msgstr "Er wordt verbinding gemaakt met %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Ondersteunde modules:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1039,6 +1085,48 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Gebruik: apt-get [opties] opdracht\n"
+"         apt-get [opties] install|remove pakket1 [pakket2 ...]\n"
+"         apt-get [opties] source pakket1 [pakket2 ...]\n"
+"\n"
+"apt-get is een eenvoudige commandoregel-interface voor het ophalen en\n"
+"installeren van pakketten. De meest gebruikte opdrachten zijn 'update\n"
+"en 'install'.\n"
+"\n"
+"Opdrachten:\n"
+"   update - Haal de huidige versie van pakketlijsten op\n"
+"   upgrade - Voer een opwaardering uit\n"
+"   install - Installeer nieuwe pakketten (pakket is b.v. libc6, niet libc6."
+"deb)\n"
+"   remove - Verwijder pakketten\n"
+"   autoremove - Verwijder automatisch alle ongebruikte pakketten\n"
+"   purge - Verwijder pakketten en hun configuratiebestanden\n"
+"   source - Haal bronarchieven op\n"
+"   build-dep - Installeer de pakketten vereist voor het bouwen van "
+"bronpakketten\n"
+"   dist-upgrade - Opwaardeer de distributie, zie apt-get(8)\n"
+"   dselect-upgrade - Opwaardeer volgens dselect-selecties\n"
+"   clean - Verwijder opgehaalde archiefbestanden\n"
+"   autoclean - Verwijder verouderde opgehaalde archiefbestanden\n"
+"   check - Controleer onvoldane vereisten\n"
+"\n"
+"Opties:\n"
+"  -h   Deze hulptekst\n"
+"  -q   Logbare uitvoer - geen voortgangsindicator\n"
+"  -qq  Geen uitvoer anders dan foutmeldingen\n"
+"  -d   Alleen ophalen - archieven NIET installeren of uitpakken\n"
+"  -s   Doe-niets. Doe alleen sorteersimulatie\n"
+"  -y   Antwoord \"ja\" op alle vragen zonder ze te stellen\n"
+"  -f   Probeer door te gaan als de integriteitstest faalt\n"
+"  -m   Probeer door te gaan als archieven niet gevonden kunnen worden\n"
+"  -u   Toon ook een lijst van bijgewerkte pakketten\n"
+"  -b   Bouw het bronpakket nadat het is opgehaald\n"
+"  -V   Toon uitgebreide versie nummers\n"
+"  -c=? Lees dit configuratiebestand\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
+"Zie de apt-get(8), sources.list(5) en apt.conf(5) handleidingen\n"
+"voor meer informatie en opties.\n"
+"                       Deze APT heeft Super Koe kracht.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1090,29 +1178,29 @@ msgstr ""
 "in het station '%s' te plaatsen en op 'enter' te drukken\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "maar het is niet geïnstalleerd"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s is ingesteld voor handmatige installatie.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s is ingesteld op automatische geïnstalleerd.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s is reeds de nieuwste versie.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s is reeds de nieuwste versie.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1121,14 +1209,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Er is gewacht op %s, maar die kwam niet"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s is ingesteld voor handmatige installatie.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Openen van %s is mislukt"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1166,8 +1254,8 @@ 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 ""
-"Gebruik 'apt-cdrom' om deze CD-ROM door APT te laten herkennen. 'apt-get "
-"update' kan niet worden gebruikt om nieuwe CD-ROM's toe te voegen"
+"Om deze APT deze CD te laten herkennen kunt u best apt-cdrom gebruiken. 'apt-"
+"get update' is niet in staat om nieuwe CDs toe te voegen"
 
 #: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
@@ -1544,9 +1632,9 @@ msgstr "Geen spiegelbestand '%s' gevonden "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Geen spiegelbestand '%s' gevonden "
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1881,7 +1969,7 @@ msgstr "Archief heeft geen 'package'-veld"
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s heeft geen voorrangsingang\n"
+msgstr " %s heeft geen voorrangsingang\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
@@ -1891,12 +1979,12 @@ msgstr "  %s beheerder is %s, niet %s\n"
 #: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s heeft geen voorrangsingang voor bronpakketten\n"
+msgstr " %s heeft geen voorrangsingang voor bronpakketten\n"
 
 #: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s heeft ook geen voorrangsingang voor binaire pakketten\n"
+msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -1908,19 +1996,19 @@ msgid "Unable to open %s"
 msgstr "Kan %s niet openen"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Misvormde voorrangsingang %s op regel %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Misvormde voorrangsingang %s op regel %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Misvormde voorrangsingang %s op regel %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1973,6 +2061,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Hernoemen van %s naar %s is mislukt"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1985,6 +2074,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Gebruik: apt-extracttemplates bestand1 [bestand2 ...]\n"
+"\n"
+"apt-extracttemplates is een programma om configuratie- en "
+"sjablooninformatie\n"
+"uit Debian pakketten te halen.\n"
+"\n"
+"Opties:\n"
+"  -h     Deze hulptekst.\n"
+"  -t      Stel de tijdelijke map in.\n"
+"  -c=? Lees dit configuratiebestand.\n"
+"  -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2184,9 +2284,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Kon de bestandsindicator %i niet dupliceren"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Kon van %lu bytes geen mmap maken"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2472,14 +2572,14 @@ msgid "Failed to exec compressor "
 msgstr "Uitvoeren van de compressor is mislukt "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2513,8 +2613,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Het pakketcachebestand heeft een niet-compatibele versie"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Het pakketcachebestand is beschadigd"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2595,7 +2696,7 @@ msgstr "Generatie vereisten"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
-msgstr "Statusinformatie wordt gelezen"
+msgstr "De status informatie wordt gelezen"
 
 #: apt-pkg/depcache.cc:244
 #, c-format
@@ -2698,9 +2799,9 @@ msgstr ""
 "'man 5 apt.conf', onder APT::Immediate-Configure. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Kon het bestand '%s' niet openen"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2740,10 +2841,13 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kan problemen niet verhelpen, u houdt defecte pakketten vast."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Ophalen van sommige indexbestanden is mislukt, deze zijn of genegeerd, of er "
+"zijn oudere versies van gebruikt."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2860,9 +2964,9 @@ msgstr "Cache heeft een niet-compatibel versienummeringssysteem"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Fout tijdens verwerken van %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2929,9 +3033,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Kon Release-bestand %s niet ontleden"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2976,7 +3080,7 @@ msgstr ""
 "dit pakket handmatig moet repareren (wegens missende architectuur)"
 
 #: apt-pkg/acquire-item.cc:1705
-#, c-format
+#, fuzzy, 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."
@@ -3037,12 +3141,12 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Identificatie... "
+msgstr "Identificatie..."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Opgeslagen label: %s\n"
+msgstr "Opgeslagen label: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3083,7 +3187,7 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
-"Kan geen pakketbestanden vinden. Misschien is dit geen Debian-schijf, of de "
+"Kan geen Package-bestanden vinden. Is dit mogelijk geen Debian schijf, of de "
 "verkeerde architectuur?"
 
 #: apt-pkg/cdrom.cc:782
@@ -3180,9 +3284,10 @@ msgid "Couldn't find any package by regex '%s'"
 msgstr "Kon geen enkel pakket vinden bij regex '%s'"
 
 #: apt-pkg/cacheset.cc:534
-#, c-format
+#, fuzzy, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
+"Kan geen versies selecteren voor pakket '%s' omdat deze zuiver virtueel is"
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3404,97 +3509,148 @@ msgstr ""
 msgid "Not locked"
 msgstr "Niet vergrendeld"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Niet-bestaand bestand %s wordt overgeslagen"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Leesfout door proces %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Verwijderen van %s is mislukt"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Kon geen pijp openen voor %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Kan %s niet aanmaken"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Lokaliseren van een geldig 'control'-bestand is mislukt"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Opvragen van de status van %sinfo is mislukt"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Kon niet wijzigen naar %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Fout bij het parsen van de MD5. regel %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Verspringen naar de beheermap %sinfo is mislukt"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Foute 'ConfFile'-sectie in het statusbestand. Regel %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Interne fout bij het ophalen van de pakketnaam"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Vinden van een 'Package:'-koptekst is mislukt, regel %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Bestandslijst worden ingelezen"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "De pakketcache dient eerst geïnitialiseerd te zijn"
+#~ 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 ""
+#~ "Openen van het lijstbestand '%sinfo/%s' is mislukt. Als u dit bestand "
+#~ "niet kunt herstellen, dient u het leeg te maken en daarna onmiddellijk "
+#~ "dezelfde versie van het pakket te installeren!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Interne fout bij het toevoegen van een omleiding"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Lezen van lijstbestand %sinfo/%s is mislukt"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Ongeldige regel in het omleidingsbestand: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Interne fout bij het verkrijgen van een knoop"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Openen van het omleidingsbestand %sdiversions is mislukt"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Het pakketcachebestand is beschadigd"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Openen van het omleidingsbestand %sdiversions is mislukt"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Ongeldige regel in het omleidingsbestand: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Interne fout bij het verkrijgen van een knoop"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Interne fout bij het toevoegen van een omleiding"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Lezen van lijstbestand %sinfo/%s is mislukt"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "De pakketcache dient eerst geïnitialiseerd te zijn"
 
-#~ 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 ""
-#~ "Openen van het lijstbestand '%sinfo/%s' is mislukt. Als u dit bestand "
-#~ "niet kunt herstellen, dient u het leeg te maken en daarna onmiddellijk "
-#~ "dezelfde versie van het pakket te installeren!"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Vinden van een 'Package:'-koptekst is mislukt, regel %lu"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Bestandslijst worden ingelezen"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Foute 'ConfFile'-sectie in het statusbestand. Regel %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Interne fout bij het ophalen van de pakketnaam"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Fout bij het parsen van de MD5. regel %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Verspringen naar de beheermap %sinfo is mislukt"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Kon niet wijzigen naar %s"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Lokaliseren van een geldig 'control'-bestand is mislukt"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Opvragen van de status van %sinfo is mislukt"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Kon geen pijp openen voor %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Kan %s niet aanmaken"
+#~ msgid "Read error from %s process"
+#~ msgstr "Leesfout door proces %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Verwijderen van %s is mislukt"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Enkele koptekstregel ontvangen met meer dan %u karakters"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "U kunt deze verwijderen via 'apt-get autoremove'."
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Misvormde voorrangsingang %s op regel %lu #1"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pakket %s is niet geïnstalleerd, en wordt dus niet verwijderd\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Misvormde voorrangsingang %s op regel %lu #2"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Niet-bestaand bestand %s wordt overgeslagen"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Misvormde voorrangsingang %s op regel %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompressor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "schrijf, de laatste %lu konden niet weggeschreven worden"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Onvoldoende ruimte voor Dynamische MMap. Gelieve de grootte van APT::"
-#~ "Cache-Limit te verhogen. Huidige waarde: %lu. (man 5 apt.conf)"
+#~ "Kon onmiddelijke configuratie van reeds uitgepakte '%s' niet uitvoeren. "
+#~ "Voor details zie 'man 5 apt.conf', onder APT::Immediate-Configure."
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Let op: Dit wordt automatische en bewust door dpkg gedaan."
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Fout tijdens verwerken van %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Fout tijdens verwerken van %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Fout tijdens verwerken van %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Fout tijdens verwerken van %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Fout tijdens verwerken van %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Fout tijdens verwerken van %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Fout tijdens verwerken van %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Fout tijdens verwerken van %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Fout tijdens verwerken van %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Fout tijdens verwerken van %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Interne fout, kon onderdeel niet vinden"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Interne fout, de groep '%s' heeft geen installeerbaar pseudopakket"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release-bestand is verlopen, %s (ongeldig sinds %s) wordt genegeerd"
diff --git a/po/nn.po b/po/nn.po
index 3b536353b..9d2b0920a 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,16 +10,14 @@ msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:16+0000\n"
-"Last-Translator: H�vard Korsvoll <korsvoll@skulelinux.no>\n"
+"PO-Revision-Date: 2005-02-14 23:30+0100\n"
+"Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: KBabel 1.9.1\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -31,8 +29,9 @@ msgid "Total package names: "
 msgstr "Tal p� pakkenamn: "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Tal p� pakkenamn: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -59,8 +58,9 @@ msgid "Total distinct versions: "
 msgstr "Tal p� einskildversjonar: "
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Tal p� einskildversjonar: "
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
@@ -71,8 +71,9 @@ msgid "Total ver/file relations: "
 msgstr "Tal p� ver./fil-forhold: "
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "Tal p� ver./fil-forhold: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
@@ -106,8 +107,9 @@ msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "Du m� oppgi n�yaktig eitt mnster"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -160,11 +162,12 @@ msgstr "  Versjonstabell:"
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s for %s %s kompilert p� %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,19 +203,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 ""
+"Bruk: apt-cache [val] kommando\n"
+"      apt-cache [val] add fil1 [fil2 ...]\n"
+"      apt-cache [val] showpkg pakke1 [pakke2 ...]\n"
+"      apt-cache [val] showsrc pakke1 [pakke2 ...]\n"
+"\n"
+"apt-cache er eit l�gniv�verkt�y som vert brukt til � handtera\n"
+"bin�rmellomlageret til APT, og til � henta informasjon fr� det.\n"
+"\n"
+"Kommandoar:\n"
+"   add - Legg ei fil til i kjeldelageret.\n"
+"   gencaches - Bygg opp lagera for b�de pakkane og kjeldekoden.\n"
+"   showpkg - Vis overordna informasjon om ein enkelt pakke.\n"
+"   showsrc - Vis data om kjeldekoden.\n"
+"   stats - Vis ein enkel statistikk.\n"
+"   dump - Vis fila med lista over tilgjengelege pakkar i tett form.\n"
+"   dumpavail - Send heile lista over tilgjengelege pakkar til stdout.\n"
+"   unmet - Vis krav som ikkje er oppfylte.\n"
+"   search - S�k gjennom pakkelista etter eit regul�rt uttrykk.\n"
+"   show - Vis ei oversikt over pakken.\n"
+"   depends - Vis r� informasjon om krava til ein pakke.\n"
+"   rdepends - Vis baklengs kravinformasjon for ein pakke\n"
+"   pkgnames - Vis ei liste over alle pakkenamn.\n"
+"   dotty - Lag pakkegrafar for GraphViz.\n"
+"   xvcg - Lag pakkegrafar for xvcg\n"
+"   policy - Vis regelinnstillingar.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten.\n"
+"  -p=? Pakkelageret.\n"
+"  -s=? Kjeldekodelageret.\n"
+"  -q   Ikkje vis framdriftsm�laren.\n"
+"  -i   Vis berre viktige krav for unmet-kommandoen.\n"
+"  -c=? Les denne oppsettsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
+"Du finn meir informasjon p� manualsidene apt-cache(8) og apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:94
+#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" �%s�\n"
+"i stasjonen �%s� og trykk Enter.\n"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "Klarte ikkje endra namnet p� %s til %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -327,10 +369,13 @@ msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
 #: cmdline/apt-get.cc:571
+#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
+"�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:602
 #, c-format
@@ -358,14 +403,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Merk, vel %s i staden for regex �%s�\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Merk, vel %s i staden for regex �%s�\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -377,8 +422,9 @@ msgid " [Installed]"
 msgstr " [Installert]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Kandidatversjonar"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -400,9 +446,9 @@ msgid "However the following packages replace it:"
 msgstr "Dei f�lgjande pakkane kan brukast i staden:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "Det finst ingen installasjonskandidat for pakken %s"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -411,19 +457,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "Merk, vel %s i staden for %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -433,9 +479,11 @@ msgstr ""
 "oppgradering.\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"Hoppar over %s, for den er installert fr� f�r og ikkje sett til "
+"oppgradering.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -448,19 +496,19 @@ msgid "%s is already the newest version.\n"
 msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "men %s skal installerast"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Vald versjon %s (%s) for %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Vald versjon %s (%s) for %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -520,8 +568,9 @@ 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:1151
+#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr ""
+msgstr "Intern feil ved tilleggjing av avleiing"
 
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
@@ -544,22 +593,22 @@ msgstr "M� henta %sB med arkiv.\n"
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
-msgstr ""
+msgstr "Du har ikkje nok ledig plass i %s"
 
 #: cmdline/apt-get.cc:1241
 #, c-format
@@ -576,12 +625,15 @@ msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
 #: cmdline/apt-get.cc:1261
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
+"Du er i ferd med � utf�ra ei handling som kan vera skadeleg.\n"
+"For � halda fram, m� du skriva n�yaktig �%s�.\n"
+" ?] "
 
 #: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
 msgid "Abort."
@@ -644,9 +696,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "Klarte ikkje f� status p� kjeldepakkelista %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -683,25 +735,27 @@ msgid "The following information may help to resolve the situation:"
 msgstr "F�lgjande informasjon kan hjelpa med � l�ysa situasjonen:"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
+msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dei f�lgjande NYE pakkane vil verta installerte:"
+msgstr[1] "Dei f�lgjande NYE pakkane vil verta installerte:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -760,9 +814,9 @@ msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "men %s skal installerast"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -783,8 +837,9 @@ msgid "Done"
 msgstr "Ferdig"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
+#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Intern feil. AllUpgrade �ydelagde noko"
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
@@ -825,9 +880,9 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:2566
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
+msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr� f�r i %s\n"
 
 #: cmdline/apt-get.cc:2603
 #, c-format
@@ -903,11 +958,11 @@ msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -923,18 +978,20 @@ msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -951,15 +1008,16 @@ msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Koplar til %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "St�tta modular:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1004,6 +1062,45 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Bruk: apt-get [val] kommando\n"
+"      apt-get [val] install|remove pakke1 [pakke2 ...]\n"
+"      apt-get [val] source pakke1 [pakke2 ...]\n"
+"\n"
+"apt-get er eit enkelt grensesnitt til bruk fr� kommandolinja for � lasta\n"
+"ned og installera pakkar. Dei vanlegaste kommandoane er �update� og\n"
+"�install�.\n"
+"\n"
+"Kommandoar:\n"
+"   update - Hent nye pakkelister.\n"
+"   upgrade - Utf�r ei oppgradering.\n"
+"   install - Installer nye pakkar (bruk pakkenamn, ikkje filnamn (foo."
+"deb)).\n"
+"   remove - Fjern pakkar.\n"
+"   source - Last ned kjeldekode fr� arkiva.\n"
+"   build-dep - Oppfyll byggjekrava for kjeldepakkar.\n"
+"   dist-upgrade - Oppgrader distribusjonen, les apt-get(8).\n"
+"   dselect-upgrade - F�lg r�da fr� �dselect�.\n"
+"   clean - Slett nedlasta arkivfiler.\n"
+"   autoclean - Slett gamle, nedlasta arkivfiler.\n"
+"   check - Stadfest at det ikkje finst krav som ikkje er oppfylte.\n"
+"\n"
+"Val:\n"
+"  -h  Vis denne hjelpeteksten.\n"
+"  -q  Ikkje vis framdriftsm�tar, for bruk i loggar.\n"
+"  -qq Inga tilbakemelding - bortsett fr� feilmeldingar.\n"
+"  -d  Berre nedlasting - IKKJE installer eller pakk ut arkivfilene.\n"
+"  -s  Skuggespel, berre simulering av handlingane.\n"
+"  -y  Svar ja p� alle sp�rsm�l utan � stoppa.\n"
+"  -f  Pr�v � halda fram sj�lv om integritetskontrollen mislukkast.\n"
+"  -m  Pr�v � halda fram sj�lv om nokre pakkar ikkje vert funne.\n"
+"  -u  Ta med oppgraderte pakkar i lista som vert vist.\n"
+"  -b  Bygg pakken etter at kjeldekoden er henta.\n"
+"  -V  Vis fullstendige versjonsnummer.\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
+"Du finn meir informasjon og fleire kommandolinjeval p� manualsidene\n"
+"til apt-get(8), sources.list(5) og apt.conf(5).\n"
+"                       APT har superku-krefter.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1051,29 +1148,29 @@ msgstr ""
 "i stasjonen �%s� og trykk Enter.\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "men er ikkje installert"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "men %s skal installerast"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "men %s skal installerast"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "Den nyaste versjonen av %s er installert fr� f�r.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1082,14 +1179,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Venta p� %s, men den fanst ikkje"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "men %s skal installerast"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Klarte ikkje opna %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1141,8 +1238,9 @@ msgstr ""
 "Klarte ikkje montera CD-plata i %s. Det kan henda plata framleis er i bruk."
 
 #: methods/cdrom.cc:254
+#, fuzzy
 msgid "Disk not found."
-msgstr ""
+msgstr "Fann ikkje fila"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
@@ -1359,14 +1457,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Mellombels feil ved oppslag av �%s�"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Det hende noko dumt ved oppslag av �%s:%s� (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Klarte ikkje kopla til %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1386,8 +1484,9 @@ msgid "Unknown error executing gpgv"
 msgstr ""
 
 #: methods/gpgv.cc:228 methods/gpgv.cc:235
+#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "Dei f�lgjande tilleggspakkane vil verta installerte:"
 
 #: methods/gpgv.cc:242
 msgid ""
@@ -1496,9 +1595,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Klarte ikkje opna fila %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1541,12 +1640,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "Nokre feil oppstod ved utpakking. Dei installerte pakkane vert no"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "sette opp. Dette kan f�ra til f�lgjefeil eller feil p� grunn av"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1624,6 +1725,7 @@ msgid "Error processing contents %s"
 msgstr "Feil ved lesing av %s"
 
 #: ftparchive/apt-ftparchive.cc:596
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1664,6 +1766,43 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
+"Bruk: apt-ftparchive [val] kommando\n"
+"Kommandoar: packages bin�rstig [overstyringsfil [stigprefiks]]\n"
+"          sources kjeldesti [overstyringsfil [stiprefiks]]\n"
+"          contents sti\n"
+"          generate config [grupper]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive opprettar indeksfiler for Debian-arkiv. Mange ulike\n"
+"m�tar kan brukast, fr� heilautomatiske til funksjonelle erstattingar\n"
+"for dpkg-scanpackages og dpkg-scansources.\n"
+"\n"
+"apt-ftparchive opprettar Package-filer fr� eit tre med .debs-filer.\n"
+"Package-fila inneheld alle kontrollfelta fr� kvar pakke i tillegg til\n"
+"MD5-n�kkel og filstorleik. Du kan bruka ei overstyringsfil for � tvinga\n"
+"gjennom verdiar for prioritet og kategori.\n"
+"\n"
+"apt-ftparchive kan p� same m�ten oppretta Sources-filer fr� eit tre\n"
+"med .dscs-filer. Du kan bruka ei overstyringsfil med --source-override.\n"
+"\n"
+"Kommandoane �packages� og �sources� skal k�yrast i rota av katalogtreet.\n"
+"Bin�rstien skal peika til toppkatalogen i det rekursive s�ket, og\n"
+"overstyringsfila skal innehalda innstillingar for overstyring.\n"
+"Stiprefikset vert lagt til filnamnfelta dersom det er oppgjeve. Her er\n"
+"eit d�me p� bruk i Debian-arkivet:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Val:\n"
+"  -h    Vis denne hjelpeteksten.\n"
+"  --md5 Styrer MD5-genereringa.\n"
+"  -s=?  Overstyringsfil for kjeldekode.\n"
+"  -q    Stille.\n"
+"  -d=?  Vel ein anna mellomlagerdatabase.\n"
+"  --no-delink Bruk avlusingsmodus med delinking.\n"
+"  --contents  Styrer opprettinga av innhaldsfila.\n"
+"  -c=?  Les denne oppsettsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling."
 
 #: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
@@ -1785,14 +1924,14 @@ msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
 
 #: ftparchive/writer.cc:721
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no source override entry\n"
-msgstr ""
+msgstr "  %s har inga overstyringsoppf�ring\n"
 
 #: ftparchive/writer.cc:725
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr ""
+msgstr "  %s har inga overstyringsoppf�ring\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -1804,19 +1943,19 @@ msgid "Unable to open %s"
 msgstr "Klarte ikkje opna %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Misforma overstyring %s linje %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Misforma overstyring %s linje %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Misforma overstyring %s linje %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1869,6 +2008,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet p� %s til %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1881,6 +2021,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates er eit verkt�y for � henta ut informasjon om\n"
+"oppsett og malar fr� Debian-pakkar.\n"
+"\n"
+"Val:\n"
+"  -h   Vis denne hjelpeteksten\n"
+"  -t   Vel mellombels katalog\n"
+"  -c=? Les denne innstillingsfila.\n"
+"  -o=? Set ei vilk�rleg innstilling, t.d. �-o dir::cache=/tmp�.\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1940,9 +2090,9 @@ msgid "Error reading archive member header"
 msgstr "Feil ved lesing av arkivmedlemshovud"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Ugyldig arkivmedlemshovud"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -1988,9 +2138,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Dobbel oppsettsfil %s/%s"
 
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write file %s"
-msgstr ""
+msgstr "Klarte ikkje skriva fila %s"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
@@ -2056,9 +2206,10 @@ msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar �%s�-medlemmen"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
+"Dette er ikkje eit gyldig DEB-arkiv, det har ingen �%s� eller �%s�-medlem"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2074,22 +2225,24 @@ msgid "Can't mmap an empty file"
 msgstr "Kan ikkje utf�ra mmap p� ei tom fil"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Klarte ikkje opna r�yr for %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Klarte ikkje laga mmap av %lu byte"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Klarte ikkje opna %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Klarte ikkje starta "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2097,8 +2250,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Klarte ikkje laga mmap av %lu byte"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Klarte ikkje skriva fila %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2194,9 +2348,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfeil %s:%u: Direktivet �%s� er ikkje st�tta"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det �vste niv�et"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2269,9 +2423,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Klarte ikkje f� status til CD-ROM"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Problem ved l�sing av fila"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2320,9 +2474,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2340,9 +2494,9 @@ msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Klarte ikkje opna r�yr for %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2353,29 +2507,29 @@ msgid "Failed to exec compressor "
 msgstr "Klarte ikkje k�yra komprimeringa "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "lese, har framleis %lu att � lesa, men ingen att"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "skrive, har framleis %lu att � skrive, men klarte ikkje"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Problem ved l�sing av fila"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Problem ved synkronisering av fila"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Problem ved oppheving av lenkje til fila"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2394,8 +2548,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Pakkelagerfila er �ydelagd"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2475,18 +2630,19 @@ msgid "Dependency generation"
 msgstr "Genererer kravforhold"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "Flettar informasjon om tilgjengelege pakkar"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "Klarte ikkje opna %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "Klarte ikkje skriva fila %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2499,29 +2655,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2564,9 +2720,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Misforma linje %u i kjeldelista %s (type)"
 
 #: apt-pkg/sourcelist.cc:289
-#, c-format
+#, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
 
 #: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2576,9 +2732,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Klarte ikkje opna fila %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2617,25 +2773,28 @@ msgstr ""
 "Klarte ikkje retta opp problema. Nokre �ydelagde pakkar er haldne tilbake."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
+"filer er brukte i staden."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Listekatalogen %spartial manglar."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Arkivkatalogen %spartial manglar."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Klarte ikkje l�sa listekatalogen"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2645,9 +2804,9 @@ msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #: apt-pkg/acquire.cc:895
-#, c-format
+#, fuzzy, c-format
 msgid "Retrieving file %li of %li"
-msgstr ""
+msgstr "Les filliste"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -2660,9 +2819,12 @@ msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 
 #: apt-pkg/acquire-worker.cc:440
-#, c-format
+#, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" �%s�\n"
+"i stasjonen �%s� og trykk Enter.\n"
 
 #: apt-pkg/init.cc:152
 #, c-format
@@ -2703,9 +2865,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2730,9 +2892,9 @@ msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Feil ved behandling av %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2743,8 +2905,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "J�ss, du har overg�tt talet p� versjonar som APT kan handtera."
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "J�ss, du har overg�tt talet p� versjonar som APT kan handtera."
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2784,8 +2947,9 @@ msgstr "Feil MD5-sum"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "Feil MD5-sum"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2795,9 +2959,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2857,14 +3021,14 @@ msgid "Size mismatch"
 msgstr "Feil storleik"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Merk, vel %s i staden for %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2872,14 +3036,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Ugyldig linje i avleiingsfila: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2902,11 +3066,12 @@ msgstr "Identifiserer ... "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Lagra etikett: %s\n"
+msgstr "Lagra etikett: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "Avmonterer CD-ROM ..."
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -2930,11 +3095,11 @@ msgid "Scanning disc for index files..\n"
 msgstr "Leitar etter indeksfiler p� disken ...\n"
 
 #: apt-pkg/cdrom.cc:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
-msgstr ""
+msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
@@ -2943,9 +3108,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:782
-#, c-format
+#, fuzzy, c-format
 msgid "Found label '%s'\n"
-msgstr ""
+msgstr "Lagra etikett: %s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -2998,9 +3163,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Feil MD5-sum"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3009,9 +3174,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Avbryt installasjon."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3024,14 +3189,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen �%s� av �%s�"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Fann ikkje pakken %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Fann ikkje pakken %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3081,24 +3246,24 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "  Installert: "
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
-#, c-format
+#, fuzzy, c-format
 msgid "Configuring %s"
-msgstr ""
+msgstr "Koplar til %s"
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
-#, c-format
+#, fuzzy, c-format
 msgid "Removing %s"
-msgstr ""
+msgstr "Opnar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "Klarte ikkje fjerna %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3112,34 +3277,34 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "Listekatalogen %spartial manglar."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Klarte ikkje opna fila %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing %s"
-msgstr ""
+msgstr "Opnar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:945
-#, c-format
+#, fuzzy, c-format
 msgid "Unpacking %s"
-msgstr ""
+msgstr "Opnar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:950
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Opnar oppsettsfila %s"
 
 #: apt-pkg/deb/dpkgpm.cc:952
-#, c-format
+#, fuzzy, c-format
 msgid "Installed %s"
-msgstr ""
+msgstr "  Installert: "
 
 #: apt-pkg/deb/dpkgpm.cc:957
 #, c-format
@@ -3147,19 +3312,19 @@ msgid "Preparing for removal of %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:959
-#, c-format
+#, fuzzy, c-format
 msgid "Removed %s"
-msgstr ""
+msgstr "Tilr�dingar"
 
 #: apt-pkg/deb/dpkgpm.cc:964
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing to completely remove %s"
-msgstr ""
+msgstr "Opnar oppsettsfila %s"
 
 #: apt-pkg/deb/dpkgpm.cc:965
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removed %s"
-msgstr ""
+msgstr "Klarte ikkje fjerna %s"
 
 #: apt-pkg/deb/dpkgpm.cc:1208
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
@@ -3219,9 +3384,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Klarte ikkje l�sa listekatalogen"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3235,81 +3400,212 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Fekk ei enkel hovudlinje over %u teikn"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Opnar oppsettsfila %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Lesefeil fr� %s-prosessen"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Klarte ikkje fjerna %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Klarte ikkje opna r�yr for %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Klarte ikkje oppretta %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Fann ikkje noka gyldig kontrollfil"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Klarte ikkje f� status til %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Klarte ikkje byta til %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Infokatalogen og den mellombelse katalogen m� vera p� det same filsystemet"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Feil ved tolking av MD5. Offset %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Klarte ikkje byta til adminkatalogen %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "�ydelagd �ConfFile�-del i statusfila. Offset %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Intern feil ved henting av pakkenamn"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Fann ikkje �Package:�-linja, offset %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Les filliste"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Pakkelageret m� f�rst klargjerast"
+#~ 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 ""
+#~ "Klarte ikkje opna listefila �%sinfo/%s�. Dersom du ikkje kan gjenoppretta "
+#~ "denne fila, b�r du oppretta ho som ei tom fil og installera den same "
+#~ "versjonen av pakken p� nytt."
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Intern feil ved tilleggjing av avleiing"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Klarte ikkje lesa listefila %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Ugyldig linje i avleiingsfila: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Intern feil ved henting av node"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Klarte ikkje opna avleiingsfila %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Avleiingsfila er �ydelagd"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Klarte ikkje opna avleiingsfila %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Intern feil ved henting av node"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Intern feil ved tilleggjing av avleiing"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Klarte ikkje lesa listefila %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Pakkelageret m� f�rst klargjerast"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Fann ikkje �Package:�-linja, offset %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "�ydelagd �ConfFile�-del i statusfila. Offset %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Feil ved tolking av MD5. Offset %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Klarte ikkje byta til %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Fann ikkje noka gyldig kontrollfil"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Klarte ikkje opna r�yr for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Lesefeil fr� %s-prosessen"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Fekk ei enkel hovudlinje over %u teikn"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Misforma overstyring %s linje %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Misforma overstyring %s linje %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Misforma overstyring %s linje %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "dekomprimering"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lese, har framleis %lu att � lesa, men ingen att"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skrive, har framleis %lu att � skrive, men klarte ikkje"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Feil ved behandling av %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Feil ved behandling av %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Feil ved behandling av %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Feil ved behandling av %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Feil ved behandling av %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Feil ved behandling av %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Feil ved behandling av %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Intern feil, fann ikkje medlem"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Feil ved behandling av %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)"
+
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Klarte ikkje sl� opp �%s�"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Klarte ikkje opna fila %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Feil ved lesing av katalogen %s"
 
 #~ 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!"
+#~ "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 ""
-#~ "Klarte ikkje opna listefila �%sinfo/%s�. Dersom du ikkje kan gjenoppretta "
-#~ "denne fila, b�r du oppretta ho som ei tom fil og installera den same "
-#~ "versjonen av pakken p� nytt."
+#~ "Sidan du berre har valt ein enkel operasjon, er det sv�rt sannsynleg at\n"
+#~ "pakken rett og slett ikkje l�t seg installera. I s�fall b�r du senda\n"
+#~ "feilmelding."
 
-#~ msgid "Reading file listing"
-#~ msgstr "Les filliste"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linja %d er for lang (maks %d)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Intern feil ved henting av pakkenamn"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linja %d er for lang (maks %d)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Klarte ikkje byta til adminkatalogen %sinfo"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Infokatalogen og den mellombelse katalogen m� vera p� det same filsystemet"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Feil ved behandling av %s (NewFileVer1)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Klarte ikkje f� status til %sinfo"
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Lagra etikett: %s \n"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Klarte ikkje oppretta %s"
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Klarte ikkje fjerna %s"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Utvalet mislukkast"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Fildatoen er endra %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Les filliste"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Klarte ikkje l�sa %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
+#~ 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 50be81ed5..b22179638 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,17 +12,16 @@ msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:24+0000\n"
-"Last-Translator: Michał Kułach <michalkulach@gmail.com>\n"
+"PO-Revision-Date: 2012-07-28 21:53+0200\n"
+"Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -846,7 +845,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Obliczanie aktualizacji... "
+msgstr "Obliczanie aktualizacji..."
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -1167,12 +1166,12 @@ msgstr "Pobieranie:"
 # Wyrównane do Hit i Err.
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "Ign. "
+msgstr "Ign.  "
 
 # Wyrównane do Hit i Ign.
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "Błąd "
+msgstr "Błąd  "
 
 #: cmdline/acqprogress.cc:140
 #, c-format
@@ -1665,7 +1664,7 @@ msgstr "Nie udało się przejść do %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\" "
+msgstr "Nie znaleziono pliku serwera lustrzanego \"%s\""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -2032,17 +2031,17 @@ msgstr "Nie można otworzyć %s"
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
 #, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Nieprawidłowa linia %llu #1 pliku override %s"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
 #, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Nieprawidłowa linia %llu #2 pliku override %s"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
 #, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Nieprawidłowa linia %llu #3 pliku override %s"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -3171,7 +3170,7 @@ msgstr "Identyfikacja.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Etykieta: %s\n"
+msgstr "Etykieta: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3531,50 +3530,36 @@ msgstr ""
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem. "
+"dpkg został przerwany, należy wykonać ręcznie \"%s\", aby naprawić problem."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Niezablokowany"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "Błąd odczytu z procesu %s"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Nie udało się otworzyć potoku dla %s"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nie udało się przejść do %s"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Błąd przy czytaniu skrótu MD5. Offset %lu"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Błędna sekcja ConfFile w pliku stanu. Offset %lu"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Pomijanie nieistniejącego pliku %s"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Nie udało się znaleźć nagłówka Package:, offset %lu"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Nie udało się usunąć %s"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Błąd wewnętrzny przy dodawaniu ominięcia"
+#~ msgid "Unable to create %s"
+#~ msgstr "Nie można utworzyć %s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Nieprawidłowa linia w pliku ominięć: %s"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Nie udało się wykonać operacji stat na %sinfo"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Plik ominięć jest uszkodzony"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Pliki info i katalog tymczasowy muszą być w tym samym systemie plików"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Nie udało się otworzyć pliku ominięć %sdiversions"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Nie udało się przejść do katalogu administracyjnego %sinfo"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Błąd wewnętrzny przy pobieraniu węzła"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Błąd wewnętrzny podczas pobierania nazwy pakietu"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Nie udało się przeczytać pliku listy %sinfo/%s"
+#~ msgid "Reading file listing"
+#~ msgstr "Czytanie listy plików"
 
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -3585,91 +3570,152 @@ msgstr "Niezablokowany"
 #~ "przywrócić tego pliku, należy utworzyć go jako pusty plik i bezzwłocznie "
 #~ "przeinstalować tę samą wersję pakietu!"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Czytanie listy plików"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Nie udało się przeczytać pliku listy %sinfo/%s"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Błąd wewnętrzny podczas pobierania nazwy pakietu"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Błąd wewnętrzny przy pobieraniu węzła"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Nie udało się przejść do katalogu administracyjnego %sinfo"
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Nie udało się otworzyć pliku ominięć %sdiversions"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Nie udało się wykonać operacji stat na %sinfo"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Plik ominięć jest uszkodzony"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Nie można utworzyć %s"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Nieprawidłowa linia w pliku ominięć: %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Nie udało się usunąć %s"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Błąd wewnętrzny przy dodawaniu ominięcia"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"."
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Magazyn podręczny pakietów musi zostać wcześniej zainicjalizowany"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Nie udało się znaleźć nagłówka Package:, offset %lu"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-"
-#~ "Limit. Aktualna wartość: %lu. (man 5 apt.conf)"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Błędna sekcja ConfFile w pliku stanu. Offset %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Błąd przy czytaniu skrótu MD5. Offset %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Nie udało się przejść do %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Nie udało się odnaleźć poprawnego pliku kontrolnego"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nie udało się otworzyć potoku dla %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Błąd odczytu z procesu %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Otrzymano pojedynczą linię nagłówka o długości ponad %u znaków"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "Uwaga: dpkg wykonał to automatycznie i celowo."
 
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Nieprawidłowa linia %2$lu #1 pliku override %1$s"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Nieprawidłowa linia %2$lu #2 pliku override %1$s"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Nieprawidłowa linia %2$lu #3 pliku override %1$s"
+
+#~ msgid "decompressor"
+#~ msgstr "dekompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "należało zapisać jeszcze %lu, ale nie udało się to"
+
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Użycie: apt-mark [opcje] {auto|manual} pakiet1 [pakiet2 ...]\n"
-#~ "\n"
-#~ "apt-mark jest prostym poleceniem wiersza poleceń do oznaczania pakietów\n"
-#~ "jako zainstalowane automatycznie lub ręcznie. Może także służyć\n"
-#~ "do wyświetlania stanu oznaczeń.\n"
-#~ "\n"
-#~ "Polecenia:\n"
-#~ "  auto - Oznacza dany pakiet jako zainstalowany automatycznie\n"
-#~ "  manual - Oznacza dany pakiet jako zainstalowany ręcznie\n"
-#~ "\n"
-#~ "Opcje:\n"
-#~ "  -h  Ten tekst pomocy\n"
-#~ "  -q   Nie pokazuje wskaźnika postępu (przydatne przy rejestrowaniu "
-#~ "działania)\n"
-#~ "  -qq  Nie wypisuje nic oprócz komunikatów błędów\n"
-#~ "  -s  Symulacja - wyświetla jedynie co powinno zostać zrobione\n"
-#~ "  -f  zapis/odczyt oznaczenia jako automatyczny/ręczny danego pliku\n"
-#~ "  -c=? Czyta wskazany plik konfiguracyjny.\n"
-#~ "  -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n"
-#~ "Proszę zapoznać się ze stronami podręcznika systemowego apt-mark(8)\n"
-#~ "i apt.conf(5), aby uzyskać więcej informacji."
+#~ "Nie udało się wykonać natychmiastowej konfiguracji rozpakowanego pakietu "
+#~ "%s. Proszę wykonać \"man 5 apt.conf\" i zapoznać się z wpisem APT::"
+#~ "Immediate-Configure aby dowiedzieć się więcej."
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Błąd wewnętrzny, nie udało się odnaleźć składnika"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Wystąpił błąd podczas przetwarzania %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
 #~ msgstr ""
-#~ "Pliki info i katalog tymczasowy muszą być w tym samym systemie plików"
+#~ "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Magazyn podręczny pakietów musi zostać wcześniej zainicjalizowany"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\""
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Nie udało się odnaleźć poprawnego pliku kontrolnego"
+#~ msgid "Could not patch file"
+#~ msgstr "Nie udało się nałożyć łatki na plik"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Pomijanie nieistniejącego pliku %s"
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Brak pakietu źródłowego \"%s\", wybieranie \"%s\" zamiast niego\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Przetwarzanie wyzwalaczy dla %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "Brak miejsca dla dynamicznego MMap"
+
+#~ 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żądano 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."
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linia %d jest zbyt długa (max %lu)"
diff --git a/po/pt.po b/po/pt.po
index 31580a522..906fc4c32 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,17 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Miguel Figueiredo <Unknown>\n"
+"POT-Creation-Date: 2012-10-15 09:49+0200\n"
+"PO-Revision-Date: 2012-06-29 15:45+0100\n"
+"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: Lokalize 1.0\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -92,80 +90,80 @@ msgstr "Espaço total desperdiçado: "
 msgid "Total space accounted for: "
 msgstr "Espaço total contabilizado: "
 
-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
-#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1382
+#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
 msgstr "Não foi encontrado nenhum pacote"
 
-#: cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:1226
 msgid "You must give at least one search pattern"
 msgstr "Tem de fornecer pelo menos um padrão de busca"
 
-#: cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1361
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 "Este comando foi depreceado. Em vez disso por favor utilize 'apt-mark "
 "showauto'."
 
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Não foi possível encontrar o pacote %s"
 
-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1486
 msgid "Package files:"
 msgstr "Ficheiros de Pacotes :"
 
-#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
+#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1503
+#: cmdline/apt-cache.cc:1507
 msgid "Pinned packages:"
 msgstr "Pacotes Marcados:"
 
-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
+#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564
 msgid "(not found)"
 msgstr "(não encontrado)"
 
-#: cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1527
 msgid "  Installed: "
 msgstr "  Instalado: "
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528
 msgid "  Candidate: "
 msgstr "  Candidato: "
 
-#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
+#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: cmdline/apt-cache.cc:1557
+#: cmdline/apt-cache.cc:1561
 msgid "  Package pin: "
 msgstr "  Marcação do Pacote: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1570
 msgid "  Version table:"
 msgstr "  Tabela de Versão:"
 
-#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
+#: cmdline/apt-get.cc:3361 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
-#: cmdline/apt-cache.cc:1686
+#: cmdline/apt-cache.cc:1690
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -352,11 +350,11 @@ msgstr "Serão actualizados os seguintes pacotes:"
 
 #: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
-msgstr "Será reposta a versão ANTERIOR dos seguintes pacotes:"
+msgstr "Será feito o DOWNGRADE aos seguintes pacotes:"
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes existentes serão mudados :"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
 
 #: cmdline/apt-get.cc:563
 #, c-format
@@ -417,7 +415,7 @@ msgstr " [Instalado]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [Não é versão candidata]"
+msgstr "[Não é versão candidata]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -635,7 +633,7 @@ msgstr "Abortado."
 msgid "Do you want to continue [Y/n]? "
 msgstr "Deseja continuar [Y/n]? "
 
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1548
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falhou obter %s  %s\n"
@@ -1031,11 +1029,11 @@ msgstr "Falhou processar as dependências de compilação"
 msgid "Changelog for %s (%s)"
 msgstr "Changlog para %s (%s)"
 
-#: cmdline/apt-get.cc:3369
+#: cmdline/apt-get.cc:3366
 msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
-#: cmdline/apt-get.cc:3410
+#: cmdline/apt-get.cc:3407
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1125,7 +1123,7 @@ msgstr ""
 "apt-get(8), sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:3575
+#: cmdline/apt-get.cc:3572
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1200,7 +1198,7 @@ msgid "%s was already not hold.\n"
 msgstr "%s já estava para não manter.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
+#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperou por %s mas não estava lá"
@@ -1358,8 +1356,8 @@ msgstr "Foi atingido o tempo limite de ligação"
 msgid "Server closed the connection"
 msgstr "O servidor fechou a ligação"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254
+#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266
 msgid "Read error"
 msgstr "Erro de leitura"
 
@@ -1372,8 +1370,8 @@ msgid "Protocol corruption"
 msgstr "Corrupção de protocolo"
 
 #: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361
+#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390
 msgid "Write error"
 msgstr "Erro de escrita"
 
@@ -1621,8 +1619,8 @@ msgstr "Erro interno"
 #: methods/mirror.cc:95 apt-inst/extract.cc:465
 #: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
 #: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
 #, c-format
 msgid "Unable to read %s"
 msgstr "Não foi possível ler %s"
@@ -1640,7 +1638,7 @@ msgstr "Impossível mudar para %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Não foi encontrado ficheiro de mirror '%s' "
+msgstr "Não foi encontrado ficheiro de mirror '%s'"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1750,7 +1748,7 @@ msgstr ""
 "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
 "tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1281
+#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1335
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Não conseguiu escrever para %s"
@@ -1983,7 +1981,7 @@ msgstr "  %s não possui entrada override\n"
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  o maintainer de %s é %s, não %s\n"
+msgstr " o maintainer de %s é %s, não %s\n"
 
 #: ftparchive/writer.cc:721
 #, c-format
@@ -2301,7 +2299,7 @@ msgstr "Não foi possível fechar mmap"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr "Não foi sincronizar mmap"
+msgstr "Não foi sincronizar mmap "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2361,7 +2359,7 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1166
 #, c-format
 msgid "Selection %s not found"
 msgstr "A selecção %s não foi encontrada"
@@ -2563,50 +2561,50 @@ msgstr "O sub-processo %s retornou um código de erro (%u)"
 msgid "Sub-process %s exited unexpectedly"
 msgstr "O sub-processo %s terminou inesperadamente"
 
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:661
 #, c-format
 msgid "Could not open file %s"
 msgstr "Não foi possível abrir ficheiro o %s"
 
-#: apt-pkg/contrib/fileutl.cc:1066
+#: apt-pkg/contrib/fileutl.cc:1046
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Não foi possível abrir o descritor de ficheiro %d"
 
-#: apt-pkg/contrib/fileutl.cc:1156
+#: apt-pkg/contrib/fileutl.cc:1136
 msgid "Failed to create subprocess IPC"
 msgstr "Falhou criar subprocesso IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1212
+#: apt-pkg/contrib/fileutl.cc:1192
 msgid "Failed to exec compressor "
 msgstr "Falhou executar compactador "
 
-#: apt-pkg/contrib/fileutl.cc:1309
+#: apt-pkg/contrib/fileutl.cc:1289
 #, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lidos, ainda restam %llu para serem lidos mas não resta nenhum"
 
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
+#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400
 #, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "escritos, ainda restam %llu para escrever mas não foi possível"
 
-#: apt-pkg/contrib/fileutl.cc:1736
+#: apt-pkg/contrib/fileutl.cc:1716
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problema ao fechar o ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1748
+#: apt-pkg/contrib/fileutl.cc:1728
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problema ao renomear o ficheiro %s para %s"
 
-#: apt-pkg/contrib/fileutl.cc:1759
+#: apt-pkg/contrib/fileutl.cc:1739
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problema ao remover o link do ficheiro %s"
 
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1754
 msgid "Problem syncing the file"
 msgstr "Problema sincronizando o ficheiro"
 
@@ -2831,7 +2829,7 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "Tipo do ficheiro de índice '%s' não é suportado"
 
-#: apt-pkg/algorithms.cc:261
+#: apt-pkg/algorithms.cc:266
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2839,7 +2837,7 @@ msgstr ""
 "O pacote %s necessita ser reinstalado, mas não foi possível encontrar um "
 "repositório para o mesmo."
 
-#: apt-pkg/algorithms.cc:1223
+#: apt-pkg/algorithms.cc:1228
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2847,13 +2845,13 @@ msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
 "pacotes mantidos (hold)."
 
-#: apt-pkg/algorithms.cc:1225
+#: apt-pkg/algorithms.cc:1230
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Não foi possível corrigir problemas, você tem pacotes mantidos (hold) "
 "estragados."
 
-#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#: apt-pkg/algorithms.cc:1574 apt-pkg/algorithms.cc:1576
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
@@ -2904,12 +2902,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter."
 
-#: apt-pkg/init.cc:152
+#: apt-pkg/init.cc:151
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Sistema de empacotamento '%s' não é suportado"
 
-#: apt-pkg/init.cc:168
+#: apt-pkg/init.cc:167
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 "Não foi possível determinar um tipo de sistema de empacotamento adequado"
@@ -2937,7 +2935,7 @@ msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 msgid "The list of sources could not be read."
 msgstr "A lista de fontes não pôde ser lida."
 
-#: apt-pkg/policy.cc:74
+#: apt-pkg/policy.cc:75
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
@@ -2946,80 +2944,81 @@ msgstr ""
 "O valor '%s' é inválido para APT::Default-Release porque tal lançamento não "
 "está disponível nas fontes"
 
-#: apt-pkg/policy.cc:396
+#: apt-pkg/policy.cc:399
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package"
 
-#: apt-pkg/policy.cc:418
+#: apt-pkg/policy.cc:421
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Não foi possível entender o tipo de marca (pin) %s"
 
-#: apt-pkg/policy.cc:426
+#: apt-pkg/policy.cc:429
 msgid "No priority (or zero) specified for pin"
 msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)"
 
-#: apt-pkg/pkgcachegen.cc:85
+#: apt-pkg/pkgcachegen.cc:87
 msgid "Cache has an incompatible versioning system"
 msgstr "A cache possui um sistema de versões incompatível"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
-#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389
-#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
-#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
-#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
+#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325
+#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375
+#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396
+#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410
+#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556
+#: apt-pkg/pkgcachegen.cc:570
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "Ocorreu um erro ao processar %s (%s%d)"
 
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:251
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de nomes de pacotes que este APT é capaz de "
 "suportar."
 
-#: apt-pkg/pkgcachegen.cc:237
+#: apt-pkg/pkgcachegen.cc:254
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de versões que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:240
+#: apt-pkg/pkgcachegen.cc:257
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de descrições que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:243
+#: apt-pkg/pkgcachegen.cc:260
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 "Uau, você excedeu o número de dependências que este APT é capaz de suportar."
 
-#: apt-pkg/pkgcachegen.cc:523
+#: apt-pkg/pkgcachegen.cc:577
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros"
 
-#: apt-pkg/pkgcachegen.cc:1092
+#: apt-pkg/pkgcachegen.cc:1146
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
 
-#: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
-#: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
+#: apt-pkg/pkgcachegen.cc:1234 apt-pkg/pkgcachegen.cc:1338
+#: apt-pkg/pkgcachegen.cc:1344 apt-pkg/pkgcachegen.cc:1501
 msgid "Reading package lists"
 msgstr "A ler as listas de pacotes"
 
-#: apt-pkg/pkgcachegen.cc:1197
+#: apt-pkg/pkgcachegen.cc:1251
 msgid "Collecting File Provides"
 msgstr "A obter File Provides"
 
-#: apt-pkg/pkgcachegen.cc:1389 apt-pkg/pkgcachegen.cc:1396
+#: apt-pkg/pkgcachegen.cc:1443 apt-pkg/pkgcachegen.cc:1450
 msgid "IO Error saving source cache"
 msgstr "Erro de I/O ao gravar a cache de código fonte"
 
@@ -3032,12 +3031,12 @@ msgstr "falhou renomear, %s (%s -> %s)."
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum não coincide"
 
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
+#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859
+#: apt-pkg/acquire-item.cc:2002
 msgid "Hash Sum mismatch"
 msgstr "Código de verificação hash não coincide"
 
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1370
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -3046,18 +3045,18 @@ msgstr ""
 "Incapaz de encontrar a entrada '%s' esperada no ficheiro Release (entrada "
 "errada em sources.list ou ficheiro malformado)"
 
-#: apt-pkg/acquire-item.cc:1397
+#: apt-pkg/acquire-item.cc:1386
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Não foi possível encontrar hash sum para '%s' no ficheiro Release"
 
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1428
 msgid "There is 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:1477
+#: apt-pkg/acquire-item.cc:1466
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -3066,12 +3065,12 @@ msgstr ""
 "O ficheiro Release para %s está expirado (inválido desde %s). Não serão "
 "aplicadas as actualizações para este repositório."
 
-#: apt-pkg/acquire-item.cc:1499
+#: apt-pkg/acquire-item.cc:1488
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1521
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
@@ -3082,12 +3081,12 @@ msgstr ""
 "GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "Erro GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1635
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3097,7 +3096,7 @@ msgstr ""
 "significar que você precisa corrigir manualmente este pacote. (devido a "
 "arquitectura em falta)"
 
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1694
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3106,7 +3105,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:1764
+#: apt-pkg/acquire-item.cc:1753
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3114,7 +3113,7 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1851
 msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
@@ -3164,7 +3163,7 @@ msgstr "A identificar.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Label Guardada: %s\n"
+msgstr "Label Guardada: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3238,22 +3237,22 @@ msgstr "A escrever lista de novas source\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "As entradas de listas de Source para este Disco são:\n"
 
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:884
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Escreveu %i registos.\n"
 
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:886
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Escreveu %i registos com %i ficheiros em falta.\n"
 
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:889
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Escreveu %i registos com %i ficheiros não coincidentes\n"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:892
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3270,13 +3269,13 @@ msgstr "Não foi possível encontrar registo de autenticação para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hash não coincide para: %s"
 
-#: apt-pkg/indexcopy.cc:662
+#: apt-pkg/indexcopy.cc:665
 #, c-format
 msgid "File %s doesn't start with a clearsigned message"
 msgstr "O ficheiro %s não começa com uma mensagem assinada"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
+#: apt-pkg/indexcopy.cc:696
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Nenhum keyring instalado em %s."
@@ -3345,123 +3344,123 @@ msgstr "Enviar cenário a resolver"
 msgid "Send request to solver"
 msgstr "Enviar pedido para resolvedor"
 
-#: apt-pkg/edsp.cc:277
+#: apt-pkg/edsp.cc:279
 msgid "Prepare for receiving solution"
 msgstr "Preparar para receber solução"
 
-#: apt-pkg/edsp.cc:284
+#: apt-pkg/edsp.cc:286
 msgid "External solver failed without a proper error message"
 msgstr "O resolvedor externo falhou sem uma mensagem de erro adequada"
 
-#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
+#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565
 msgid "Execute external solver"
 msgstr "Executar resolvedor externo"
 
-#: apt-pkg/deb/dpkgpm.cc:72
+#: apt-pkg/deb/dpkgpm.cc:73
 #, c-format
 msgid "Installing %s"
 msgstr "A instalar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
+#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952
 #, c-format
 msgid "Configuring %s"
 msgstr "A configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
+#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75
+#: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Completely removing %s"
 msgstr "A remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "A notar o desaparecimento de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:78
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "A correr o 'trigger' de pós-instalação %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
+#: apt-pkg/deb/dpkgpm.cc:705
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
+#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Não foi possível abrir ficheiro o '%s'"
 
-#: apt-pkg/deb/dpkgpm.cc:944
+#: apt-pkg/deb/dpkgpm.cc:945
 #, c-format
 msgid "Preparing %s"
 msgstr "A preparar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:945
+#: apt-pkg/deb/dpkgpm.cc:946
 #, c-format
 msgid "Unpacking %s"
 msgstr "A desempacotar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:950
+#: apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "A preparar para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:952
+#: apt-pkg/deb/dpkgpm.cc:953
 #, c-format
 msgid "Installed %s"
 msgstr "%s instalado"
 
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:958
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "A preparar a remoção de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:959
+#: apt-pkg/deb/dpkgpm.cc:960
 #, c-format
 msgid "Removed %s"
 msgstr "%s removido"
 
-#: apt-pkg/deb/dpkgpm.cc:964
+#: apt-pkg/deb/dpkgpm.cc:965
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "A preparar para remover completamente %s"
 
-#: apt-pkg/deb/dpkgpm.cc:965
+#: apt-pkg/deb/dpkgpm.cc:966
 #, c-format
 msgid "Completely removed %s"
 msgstr "Remoção completa de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1208
+#: apt-pkg/deb/dpkgpm.cc:1213
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Não é possível escrever o registo (log), openpty() falhou (/dev/pts não está "
 "montado?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1238
+#: apt-pkg/deb/dpkgpm.cc:1243
 msgid "Running dpkg"
 msgstr "A correr o dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1410
+#: apt-pkg/deb/dpkgpm.cc:1415
 msgid "Operation was interrupted before it could finish"
 msgstr "A operação foi interrompida antes de poder terminar"
 
-#: apt-pkg/deb/dpkgpm.cc:1472
+#: apt-pkg/deb/dpkgpm.cc:1477
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1482
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependências - deixando por configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1479
+#: apt-pkg/deb/dpkgpm.cc:1484
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3469,7 +3468,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
 "de seguimento de um erro anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1485
+#: apt-pkg/deb/dpkgpm.cc:1490
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3477,7 +3476,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
 "cheio"
 
-#: apt-pkg/deb/dpkgpm.cc:1492
+#: apt-pkg/deb/dpkgpm.cc:1496
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3485,13 +3484,7 @@ msgstr ""
 "Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
 "memória esgotada"
 
-#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1526
+#: apt-pkg/deb/dpkgpm.cc:1503
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3522,103 +3515,323 @@ msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
 "O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
-"'%s' "
+"'%s'"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Sem acesso exclusivo"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "A saltar ficheiro %s inexistente"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Erro de leitura do processo %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Falhou remover %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Não foi possível abrir pipe para %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Não foi capaz de criar %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Falha em localizar um ficheiro de controle válido"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Falhou stat %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Não foi possível mudar para %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Os directórios info e temp precisam estar no mesmo sistema de ficheiros"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Erro ao fazer parse ao MD5. Offset %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Falhou mudar para o directório administrativo %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Secção ConfFile errada no ficheiro de estado. Offset %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Erro Interno ao obter um nome de pacote"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Falhou encontrar um Pacote: cabeçalho, posição %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "A ler a listagem de ficheiros"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "A cache de pacotes tem de ser inicializada primeiro"
+#~ 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 ""
+#~ "Falha abrir o ficheiro da lista '%sinfo/%s'. Caso você não consiga "
+#~ "restaurar este ficheiro, crie outro vazio e reinstale imediatamente a a "
+#~ "mesma versão do pacote!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Erro interno ao adicionar um desvio"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Falhou ler o ficheiro de lista %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Linha inválida no ficheiro de desvio: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Erro interno ao obter um nó"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Falhou abrir o ficheiro de desvios %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "O ficheiro de desvios está corrompido"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Falhou abrir o ficheiro de desvios %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Linha inválida no ficheiro de desvio: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Erro interno ao obter um nó"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Erro interno ao adicionar um desvio"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Falhou ler o ficheiro de lista %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "A cache de pacotes tem de ser inicializada primeiro"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Falhou encontrar um Pacote: cabeçalho, posição %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Secção ConfFile errada no ficheiro de estado. Offset %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Erro ao fazer parse ao MD5. Offset %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Não foi possível mudar para %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Falha em localizar um ficheiro de controle válido"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Não foi possível abrir pipe para %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Erro de leitura do processo %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Override %s malformado linha %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Override %s malformado linha %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Override %s malformado linha %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "descompactador"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
 
 #~ 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!"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Falha abrir o ficheiro da lista '%sinfo/%s'. Caso você não consiga "
-#~ "restaurar este ficheiro, crie outro vazio e reinstale imediatamente a a "
-#~ "mesma versão do pacote!"
+#~ "Não foi possível proceder à configuração imediata no já descompactado "
+#~ "'%s'. Para mais detalhes por favor veja man 5 apt.conf em APT::Immediate-"
+#~ "Configure."
 
-#~ msgid "Reading file listing"
-#~ msgstr "A ler a listagem de ficheiros"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewPackage)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Erro Interno ao obter um nome de pacote"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Ocorreu um erro ao processar %s (UsePackage1)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Falhou mudar para o directório administrativo %sinfo"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewFileDesc1)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Ocorreu um erro ao processar %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Ocorreu um erro ao processar %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Ocorreu um erro ao processar %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Ocorreu um erro ao processar %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Erro Interno, não foi possível localizar membro"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Erro interno, grupo '%s' não tem pseudo-pacote instalável"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Ficheiro Release expirou, a ignorar %s (inválido desde %s)"
+
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Você deve dar exactamente um pattern"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 #~ msgstr ""
-#~ "Os directórios info e temp precisam estar no mesmo sistema de ficheiros"
+#~ "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A "
+#~ "sair."
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Não foi capaz de criar %s"
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Ocorreu um erro ao processar %s (NewVersion2)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Falhou remover %s"
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Utilize 'apt-get autoremove' para os remover."
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Não foi possível aceder à 'keyring': '%s'"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "O pacote %s não está instalado, por isso não será removido\n"
+#~ msgid "Could not patch file"
+#~ msgstr "Não foi possível aplicar o 'patch' ao ficheiro"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Falhou stat %sinfo"
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "A processar chamadas para %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "'Dynamic MMap' ficou sem espaço"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "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 ""
-#~ "O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::"
-#~ "Cache-Limit. Valor actual: %lu. (man 5 apt.conf)"
+#~ "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\n"
+#~ "relatório de bug contra esse pacote."
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "A saltar ficheiro %s inexistente"
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "a linha %d é demasiado longa (max %lu)"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linha %d é demasiado longa (max %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Um erro ocorreu ao processar %s (NovoArquivoVer1)"
+
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Label Guardada: %s \n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "Encontrou %i indexes de pacotes, %indexes de source e %i assinaturas\n"
+
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Select falhou."
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Data do ficheiro mudou %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Lendo Lista de Ficheiros"
+
+#~ msgid "Could not execute "
+#~ msgstr "Impossível de executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "A preparar para remover com a configuração %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Removido com a configuração %s"
+
+#~ msgid "The pkg cache must be initialize first"
+#~ msgstr "A cache de pacotes deve ser inicializada primeiro"
+
+#~ msgid "Error occured while processing %s (NewPackage)"
+#~ msgstr "Um erro ocorreu ao processar %s (NovoPacote)"
+
+#~ msgid "Error occured while processing %s (UsePackage1)"
+#~ msgstr "Um erro ocorreu ao processar %s (UsePacote1)"
+
+#~ msgid "Error occured while processing %s (UsePackage2)"
+#~ msgstr "Um erro ocorreu ao processar %s (UsePacote2)"
+
+#~ msgid "Error occured while processing %s (NewVersion1)"
+#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão1)"
+
+#~ msgid "Error occured while processing %s (UsePackage3)"
+#~ msgstr "Um erro ocorreu ao processar %s (UsePacote3)"
+
+#~ msgid "Error occured while processing %s (NewVersion2)"
+#~ msgstr "Um erro ocorreu ao processar %s (NovaVersão2)"
+
+#~ msgid "Error occured while processing %s (FindPkg)"
+#~ msgstr "Um erro ocorreu ao processar %s (FindPkg)"
+
+#~ msgid "Error occured while processing %s (CollectFileProvides)"
+#~ msgstr "Um erro ocorreu ao processar %s (CollectFileProvides)"
+
+#~ 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"
+
+#~ 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 ""
+#~ "Alguns pacotes quebrados foram encontrados enquanto se tentava "
+#~ "processar \n"
+#~ "as dependências de construção.\n"
+#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los."
+
+#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
+#~ msgstr ""
+#~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ."
+#~ "debs."
+
+#~ msgid "Extract "
+#~ msgstr "extra"
+
+#~ msgid "De-replaced "
+#~ msgstr "Substitui"
+
+#~ msgid "Replaced file "
+#~ msgstr "Substitui"
+
+#~ msgid "Regex compilation error"
+#~ msgstr "Erro de compilação de regex - %s"
+
+#~ msgid "Failed to stat %s%s"
+#~ msgstr "Falha ao baixar %s  %s\n"
+
+#~ msgid "Failed to open %s.new"
+#~ msgstr "Falha ao baixar %s  %s\n"
+
+#~ msgid "Failed to rename %s.new to %s"
+#~ msgstr "Falha ao baixar %s  %s\n"
+
+#~ msgid "Couldn't wait for subprocess"
+#~ msgstr "Não foi possível checar a lista de pacotes fonte %s"
+
+#~ msgid " files "
+#~ msgstr " falhou."
+
+#~ msgid "Done. "
+#~ msgstr "Pronto"
+
+#~ msgid "Could not find a record in the DSC '%s'"
+#~ msgstr "Impossível achar pacote %s"
+
+#~ msgid "Failed too stat %s"
+#~ msgstr "Impossível checar %s."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 17cb4fa76..95b9d73aa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,17 +8,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Felipe Augusto van de Wiel (faw) <Unknown>\n"
+"PO-Revision-Date: 2008-11-17 02:33-0200\n"
+"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
 "org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -30,8 +27,9 @@ msgid "Total package names: "
 msgstr "Total de Nomes de Pacotes: "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr "Total de estruturas de pacote: "
+msgstr "Total de Nomes de Pacotes: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -105,8 +103,9 @@ msgid "No packages found"
 msgstr "Nenhum pacote encontrado"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "Você deve fornecer pelo menos um padrão de busca"
+msgstr "Você deve passar exatamente um padrão"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -167,6 +166,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -202,53 +202,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 ""
-"Uso: apt-cache [opção] comando\n"
-"       apt-cache [opção] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [opção] showsrc pkg1 [pkg2 ...]\n"
+"Uso: apt-cache [opções] comando\n"
+"     apt-cache [opções] add arquivo1 [arquivo1 ...]\n"
+"     apt-cache [opções] showpkg pacote1 [pacote2 ...]\n"
+"     apt-cache [opções] showsrc pacote1 [pacote2 ...]\n"
 "\n"
-"apt-cache é uma ferramenta simples usado para consultar informações\n"
-"a partir de arquivos binários do APT em cache\n"
+"O apt-cache é uma ferramenta de baixo nível usada para manipular os\n"
+"arquivos de cache binários do APT e para buscar informações neles\n"
 "\n"
 "Comandos:\n"
-"   gencaches - Compila o pacote e o cache fonte\n"
-"   showpkg - Mostra algumas informações gerais para um único pacote\n"
-"   showsrc - Mostrar registros da fonte\n"
+"   add - Adiciona um arquivo de pacote ao cache de fontes\n"
+"   gencaches - Constrói ambos os caches de pacotes e fontes\n"
+"   showpkg - Mostra informações gerais para um único pacote\n"
+"   showsrc - Mostra registros fontes\n"
 "   stats - Mostra algumas estatísticas básicas\n"
-"   dump - Mostra o arquivo inteiro de uma forma concisa\n"
-"   dumpavail - Imprime um arquivo disponível para stdout\n"
-"   unmet - Mostra dependências não satisfeitas\n"
-"   search - Pesquisa na lista de pacotes por um padrão regex\n"
-"   show - Mostra um registro legível para o pacote\n"
-"   depends - Mostra informações de dependência bruta para um pacote\n"
-"   rdepends - Mostra informações de dependência reversa para um pacote\n"
-"   pkgnames - Lista os nomes de todos os pacotes no sistema\n"
-"   dotty - Gera pacotes gráficos para GraphViz\n"
-"   xvcg - Gera pacotes gráficos para xvcg\n"
-"   policy - Mostra as definições de política\n"
+"   dump - Mostra o arquivo inteiro em uma forma concisa\n"
+"   dumpavail - Imprime um arquivo \"available\" para stdout\n"
+"   unmet - Mostra dependências desencontradas\n"
+"   search - Procura a lista de pacotes por um padrão regex\n"
+"   show - Mostra um registro legível sobre o pacote\n"
+"   depends - Mostra informações de dependências não processadas de um "
+"pacote\n"
+"   rdepends - Mostra informações de dependências reversas de um pacote\n"
+"   pkgnames - Lista o nome de todos os pacotes no sistema\n"
+"   dotty - Gera gráficos de pacotes para o GraphViz\n"
+"   xvcg - Gera gráficos de pacotes para o xvcg\n"
+"   policy - Mostra as configurações de políticas\n"
 "\n"
 "Opções:\n"
-"  -h   texto de ajuda.\n"
-"  -p=? O cache dos pacotes.\n"
-"  -s=? O cache fonte.\n"
-"  -q   Desativar indicador de progresso.\n"
-"  -i   Mostrar só deps importantes para o comando unmet.\n"
-"  -c=? Ler este arquivo de configuração\n"
-"  -o=? Definir uma opção de configuração arbitrária, eg -o dir::cache=/tmp\n"
-"Veja o manual do apt-cache (8) e apt.conf (5) para mais informações.\n"
+"  -h   Este texto de ajuda.\n"
+"  -p=? O cache de pacotes.\n"
+"  -s=? O cache de fontes.\n"
+"  -q   Desabilita o indicador de progresso.\n"
+"  -i   Mostra somente dependências importantes para o comando \"unmet\".\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
+"Veja as páginas de manual apt-cache(8) e apt.conf(5) para mais informações.\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
-"Por favor, forneça um nome para este disco, como 'Debian 5.0.3 Disco 1'"
+"Por favor, forneça um nome para este Disco, algo como 'Debian 2.1r1 Disco 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor, insira um Disco na unidade e pressione enter"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Falha ao montar '%s' para '%s'"
+msgstr "Falhou ao renomear %s para %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -357,7 +362,7 @@ msgstr "Os pacotes a seguir serão REVERTIDOS:"
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
-msgstr "Os seguintes pacotes suspensos serão alterados:"
+msgstr "Os seguintes pacotes mantidos serão mudados:"
 
 #: cmdline/apt-get.cc:563
 #, c-format
@@ -399,14 +404,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Nota, selecionando '%s' para a tarefa '%s'\n"
+msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Nota, selecionando '%s' para a expressão regular '%s'\n"
+msgstr "Nota, selecionando %s para expressão regular '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -418,8 +423,9 @@ msgid " [Installed]"
 msgstr " [Instalado]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr " [Sem versão candidata]"
+msgstr "Versões candidatas"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -441,9 +447,9 @@ msgid "However the following packages replace it:"
 msgstr "No entanto, os pacotes a seguir o substituem:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "O pacote '%s' não possui candidato para instalação"
+msgstr "O pacote %s não tem candidato para instalação"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -452,21 +458,19 @@ msgstr "Pacotes virtuais como '%s' não podem ser removidos\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
-"Pacote '%s' não está instalado, portanto não foi removido. Você quis dizer "
-"'%s'?\n"
+msgstr "O pacote %s não está instalado, então não será removido\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pacote '%s' não está instalado, portanto não foi removido\n"
+msgstr "O pacote %s não está instalado, então não será removido\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Nota, selecionando '%s' ao invés de '%s'\n"
+msgstr "Nota, selecionando %s ao invés de %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -474,10 +478,9 @@ 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:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Pulando %s, não está instalado e foram necessárias somente atualizações.\n"
+msgstr "Pulando %s, já está instalado e a atualização não está configurada.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -495,14 +498,14 @@ msgid "%s set to manually installed.\n"
 msgstr "%s configurado para instalar manualmente.\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versão selecionada '%s' (%s) para '%s'\n"
+msgstr "Versão selecionada %s (%s) para %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versão selecionada '%s' (%s) para '%s' porque '%s'\n"
+msgstr "Versão selecionada %s (%s) para %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -678,11 +681,7 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"O seguinte pacote desapareceu de seu sistema assim como\n"
-"todos os arquivos foram sobrescritos por outros pacotes:"
 msgstr[1] ""
-"Os seguintes pacotes desapareceram de seu sistema assim como\n"
-"todos os arquivos foram sobrescritos por outros pacotes:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -694,9 +693,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignorar indisponibilidade da versão '%s' do pacote '%s'"
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Escolhendo '%s' como pacote fonte, em vez de '%s'\n"
+msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -739,31 +738,36 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro Interno, o AutoRemover quebrou coisas"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] ""
-"O seguinte pacote foi automaticamente instalado e não é mais necessário:"
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
 msgstr[1] ""
 "Os seguintes pacotes foram automaticamente instalados e não são mais "
-"necessários:"
+"requeridos:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] ""
-"O pacote %lu foi instalado automaticamente e não é mais necessário:\n"
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
 msgstr[1] ""
-"Os pacotes %lu foram instalados automaticamente e não são mais necessários:\n"
+"Os seguintes pacotes foram automaticamente instalados e não são mais "
+"requeridos:"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Use 'apt-get autoremove' para removê-lo."
+msgstr[0] "Use 'apt-get autoremove' para removê-los."
 msgstr[1] "Use 'apt-get autoremove' para removê-los."
 
 #: cmdline/apt-get.cc:1854
@@ -816,9 +820,9 @@ msgid "Couldn't find package %s"
 msgstr "Impossível achar pacote %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s definido para instalado automaticamente.\n"
+msgstr "%s configurado para instalar manualmente.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -972,13 +976,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s não tem dependências de construção.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"%s dependência por %s não pode ser satisfeita porque %s não não autorizado "
-"nos pacotes '%s'"
+"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
+"pode ser encontrado"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -997,22 +1001,22 @@ msgstr ""
 "novo"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"dependência %s para %s não foi atendida porque a versão candidata do pacote "
-"%s não pode satisfazer os requisitos de versão"
+"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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"dependência %s para %s não pode ser satisfeita porque o pacote %s não tem "
-"versão candidata"
+"a dependência de %s por %s não pode ser satisfeita porque o pacote %s não "
+"pode ser encontrado"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -1029,15 +1033,16 @@ msgid "Failed to process build dependencies"
 msgstr "Falhou ao processar as dependências de construção"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Log de alteração para %s (%s)"
+msgstr "Conectando em %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Módulos para os quais há suporte:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1082,46 +1087,45 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Uso: apt-get [opção] comando\n"
-"       apt-get [opção] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [opção] source pkg1 [pkg2 ...]\n"
+"Uso: apt-get [opções] comando\n"
+"     apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
+"     apt-get [opções] source pacote1 [pacote2 ...]\n"
 "\n"
-"apt-get é uma interface simples de linha de comando para fazer o download e\n"
-"instalação de pacotes. Os comandos usados ​​mais frequentemente são update\n"
-"e install.\n"
+"O apt-get é uma interface simples de linha de comando para baixar\n"
+"pacotes e instalá-los. Os comandos usados mais frequentemente são\n"
+"update e install.\n"
 "\n"
 "Comandos:\n"
 "   update - Obtém novas listas de pacotes\n"
-"   upgrade - Realizar uma atualização\n"
-"   install - Instalar novos pacotes (pkg é libc6 não libc6.deb)\n"
-"   remove - Remover pacotes\n"
-"   autoremove - Remove automaticamente todos os pacotes não utilizados\n"
-"   purge - Remover pacotes e arquivos de configuração\n"
-"   source - Baixar arquivos de código fonte\n"
-"   build-dep - Configurar dependências de compilação de pacotes fonte\n"
-"   dist-upgrade - Atualização da distribuição, ver apt-get(8)\n"
+"   upgrade - Realiza uma atualização\n"
+"   install - Instala novos pacotes (um pacote é libc6 e não libc6.deb)\n"
+"   remove - Remove pacotes\n"
+"   autoremove - Remove automaticamente todos os pacotes não usados\n"
+"   purge - Remove e expurga (\"purge\") pacotes\n"
+"   source - Baixa arquivos fonte\n"
+"   build-dep - Configura as dependências de compilação de pacotes fonte\n"
+"   dist-upgrade - Atualiza a distribuição, veja apt-get(8)\n"
 "   dselect-upgrade - Segue as seleções do dselect\n"
-"   clean - Apaga arquivos baixados\n"
-"   autoclean - Apaga arquivos antigos baixados\n"
+"   clean - Apaga arquivos baixados para instalação\n"
+"   autoclean - Apaga arquivos antigos baixados para instalação\n"
 "   check - Verifica se não há dependências quebradas\n"
-"   changelog - Baixar e exibir o changelog para o pacote dado\n"
-"   download - Faz o download do pacote binário para o diretório atual\n"
 "\n"
 "Opções:\n"
-"  -h  Texto de ajuda.\n"
-"  -q  Log de saída - sem indicador de progresso\n"
+"  -h  Este texto de ajuda\n"
+"  -q  Saída que pode ser registrada em log - sem indicador de progresso\n"
 "  -qq Sem saída, exceto para erros\n"
-"  -d  Fazer apenas o Download - NÃO instalar ou descompactar arquivos\n"
-"  -s  Não-agir. Realizar simulação de pedido\n"
-"  -y  Assumir Sim para todas as perguntas e não solicitar\n"
-"  -f  Tentativa de corrigir um sistema com dependências quebradas\n"
-"  -m  Tentar continuar se os arquivos não podem ser localizados\n"
-"  -u  Mostrar uma lista de pacotes atualizados\n"
-"  -b  Compilar o pacote fonte depois de baixá-lo\n"
-"  -V  Mostrar detalhadamente números da versão\n"
-"  -c=? Ler este arquivo de configuração\n"
-"  -o=? Definir uma opção de configuração arbitrária, eg -o dir::cache=/tmp\n"
-"Ver as páginas do manual do apt-get(8), sources.list(5) e apt.conf(5)\n"
+"  -d  Apenas baixa - NÃO instala ou desempacota arquivos\n"
+"  -s  Não-age. Executa simulação de ordenação\n"
+"  -y  Assume Sim para todas as perguntas e não questiona\n"
+"  -f  Tenta corrigir um sistema com dependências quebradas\n"
+"  -m  Tenta continuar se os arquivos não podem ser localizados\n"
+"  -u  Mostra uma lista de pacotes atualizados também\n"
+"  -b  Constrói o pacote fonte depois de baixá-lo\n"
+"  -V  Exibe números de versões mais detalhados\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
+"tmp\n"
+"Veja as páginas de manual apt-get(8), sources.list(5) e apt.conf(5)\n"
 "para mais informações e opções.\n"
 "                       Este APT tem Poderes de Super Vaca.\n"
 
@@ -1175,29 +1179,29 @@ msgstr ""
 "na unidade '%s' e pressione enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s não pode ser marcado pois não está instalado.\n"
+msgstr "mas não está instalado"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s já estava definido para ser instalado manualmente.\n"
+msgstr "%s configurado para instalar manualmente.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s já estava definido para ser instalado automaticamente.\n"
+msgstr "%s configurado para instalar manualmente.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s já estava definido como suspenso.\n"
+msgstr "%s já é a versão mais nova.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s já estava definido como não-suspenso.\n"
+msgstr "%s já é a versão mais nova.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1206,14 +1210,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Esperado %s mas este não estava lá"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s definido com suspenso.\n"
+msgstr "%s configurado para instalar manualmente.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Cancelada a suspensão de %s.\n"
+msgstr "Falhou ao abrir %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1503,14 +1507,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária resolvendo '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Algo estranho aconteceu '%s:%s' resolvendo (%i - %s)"
+msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Desabilitado para conectar com %s:%s:"
+msgstr "Impossível conectar em %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1524,9 +1528,10 @@ msgid "At least one invalid signature was encountered."
 msgstr "Ao menos uma assinatura inválida foi encontrada."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"Não foi possível executar o 'gpgv' para verificar a assinatura (o gpgv está "
+"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
 "instalado?)"
 
 #: methods/gpgv.cc:194
@@ -1646,9 +1651,9 @@ msgstr "Nenhum arquivo de espelho \\\"%s\\\" encontrado "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "Não foi possível ler arquivo repositório '%s'"
+msgstr "Não foi possível abrir arquivo %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1694,13 +1699,20 @@ msgstr "Pressione enter para continuar."
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Você quer apagar quaisquer arquivos .deb previamente baixados?"
 
+# Note to translators: The following four messages belong together. It doesn't
+# matter where sentences start, but it has to fit in just these four lines, and
+# at only 80 characters per line, if possible.
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Ocorreram alguns erros ao descompactar. Pacotes que foram instalados"
+msgstr ""
+"Alguns erros ocorreram ao desempacotar. Vou configurar os pacotes que foram"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "será configurado. Isso pode resultar em erros duplicados"
+msgstr ""
+"instalados. Isto pode resultar em erros duplicados ou erros causados por"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1881,12 +1893,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "BD é antigo, tentando atualizar %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Formato do BD é inválido. Se você atualizou de uma versão mais antiga do "
-"apt, remova e recrie o banco de dados."
+"Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do "
+"apt, por favor, remova e recrie o banco de dados."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -2002,19 +2015,19 @@ msgid "Unable to open %s"
 msgstr "Impossível abrir %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Substituir %s malformado, linha %llu #1"
+msgstr "Override malformado %s linha %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Substituir %s malformado, linha %llu #2"
+msgstr "Override malformado %s linha %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Substituir %s malformado, linha %llu #3"
+msgstr "Override malformado %s linha %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -2067,6 +2080,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Falhou ao renomear %s para %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -2079,16 +2093,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Uso: apt-internal-solver\n"
+"Uso: apt-extracttemplates arquivo1 [arquivo2 ...]\n"
 "\n"
-"apt-internal-solver é uma interface para usar o solucionador interno\n"
-"como se fosse externo para a família APT em depurações e etc\n"
+"O apt-extracttemplates é uma ferramenta para extrair informações de modelo\n"
+"(\"template\") e configuração de pacotes debian.\n"
 "\n"
 "Opções:\n"
-"-h Este texto de ajuda\n"
-"-q Saída registrável - sem indicador de progresso\n"
-"-c=? Ler este arquivo de configuração\n"
-"-o=? Definir uma opção de configuração arbitrária, exemplo -o dir::cache=/"
+"  -h   Este texto de ajuda\n"
+"  -t   Define o diretório temporário\n"
+"  -c=? Lê o arquivo de configuração especificado.\n"
+"  -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/"
 "tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
@@ -2150,9 +2164,9 @@ msgid "Error reading archive member header"
 msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr "Cabeçalho de arquivo inválido %s"
+msgstr "Cabeçalho membro de arquivo inválido"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2285,22 +2299,24 @@ msgid "Can't mmap an empty file"
 msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Não foi possível duplicar o descritor de arquivo %i"
+msgstr "Não foi possível abrir \"pipe\" para %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Não foi possível fazer mmap de %llu bytes"
+msgstr "Não foi possível fazer \"mmap\" de %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr "Não foi possível fechar o mmap"
+msgstr "Impossível abrir %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "Não foi possível sincronizar o mmap"
+msgstr "Impossível invocar "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2412,11 +2428,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Erro de sintaxe %s: %u: as diretivas de limpeza requer uma árvore de opção "
-"como argumento"
+"Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2490,9 +2505,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Impossível executar \"stat\" no cdrom"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Problema ao fechar o arquivo gzip %s"
+msgstr "Problema fechando o arquivo"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2542,9 +2557,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Sub-processo %s recebido o sinal %u."
+msgstr "Sub-processo %s recebeu uma falha de segmentação."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2562,9 +2577,9 @@ msgid "Could not open file %s"
 msgstr "Não foi possível abrir arquivo %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Não foi possível abrir o descritor de arquivo %d"
+msgstr "Não foi possível abrir \"pipe\" para %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2575,29 +2590,29 @@ msgid "Failed to exec compressor "
 msgstr "Falhou ao executar compactador "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "ler, ainda tem %llu para ler, mas nenhuma restou"
+msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "escrever, ainda tem %llu para escrever, mas não conseguiu"
+msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr "Problema ao fechar o arquivo %s"
+msgstr "Problema fechando o arquivo"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Problema ao renomear o arquivo %s para %s"
+msgstr "Problema sincronizando o arquivo"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Problema ao remover o link do arquivo %s"
+msgstr "Problema removendo o arquivo"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2616,8 +2631,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "O arquivo de cache de pacotes é uma versão incompatível"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "O arquivo de cache de pacotes está corrompido, ele é muito pequeno"
+msgstr "O arquivo de cache de pacotes está corrompido"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2721,32 +2737,33 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Impossível analisar arquivo de pacote %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Linha %lu está incompleta na lista %s ([opção] incapaz de analisar)"
+msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linha %lu está incompleta na lista de fontes %s ([opção] muito curta)"
+msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Linha %lu está incompleta na lista de fontes %s ([%s] não está assinada)"
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linha %lu está incompleta na lista de fontes %s ([%s] não tem chave)"
+msgstr ""
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Linha %lu está incompleta na lista de fontes %s ([%s] a chave %s não tem "
-"valor)"
+"Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2804,9 +2821,9 @@ msgstr ""
 "man 5 apt.conf em APT::Immediate-Configure para mais detalhes. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr "Não foi possível configurar o '%s'. "
+msgstr "Não foi possível abrir arquivo %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2839,35 +2856,35 @@ msgid ""
 "held packages."
 msgstr ""
 "Erro, pkgProblemResolver::Resolve gerou falhas, isto pode ser causado por "
-"pacotes suspensos."
+"pacotes mantidos (hold)."
 
 #: apt-pkg/algorithms.cc:1225
 msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Não foi possível corrigir os problemas, você suspendeu pacotes quebrados."
+msgstr "Impossível corrigir problemas, você manteve (hold) pacotes quebrados."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Alguns arquivos index falharam ao ser baixados. Eles foram ignorados, ou "
-"cópias antigas são usadas ao invés."
+"Alguns arquivos de índice falharam para baixar, eles foram ignorados ou os "
+"antigos foram usados no lugar."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr "A lista de diretórios %s está parcialmente incompleta."
+msgstr "Diretório de listas %spartial está faltando."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr "O diretório %s está faltando parcialmente alguns arquivos."
+msgstr "Diretório de arquivos %spartial está faltando."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr "Não foi possível travar o diretório %s"
+msgstr "Impossível criar trava no diretório de listas"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2939,11 +2956,9 @@ msgstr ""
 "está disponível na origem"
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Registro inválido no arquivo de preferências %s, cabeçalho do pacote "
-"inexistente"
+msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2968,9 +2983,9 @@ msgstr "O cache possui um sistema de versões incompatível"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erro ocorreu ao processar %s (%s%d)"
+msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -3041,9 +3056,9 @@ msgstr ""
 "(entrada incorreta em sources.list ou arquivo corrompido)"
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Não é possível encontrar soma de hash  para '%s' no arquivo de Release"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3110,14 +3125,14 @@ msgid "Size mismatch"
 msgstr "Tamanho incorreto"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Não é possível analisar o arquivo liberado %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr "Sem seções no arquivo liberado %s"
+msgstr "Nota, selecionando %s ao invés de %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -3125,14 +3140,14 @@ msgid "No Hash entry in Release file %s"
 msgstr "Sem entradas hash no arquivo liberado %s"
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Entrada 'Válido até' é inválida no arquivo Release: %s"
+msgstr "Linha inválida no arquivo de desvios: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Entrada 'Date' é inválida no arquivo Release: %s"
+msgstr "Impossível analisar arquivo de pacote %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3155,7 +3170,7 @@ msgstr "Identificando.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Rótulo armazenado: %s\n"
+msgstr "Rótulo armazenado: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3257,9 +3272,9 @@ msgid "Can't find authentication record for: %s"
 msgstr "Não é possível encontrar o registro de autenticação para: %s"
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Hash incompatível para: %s"
+msgstr "Hash Sum incorreto"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3268,9 +3283,9 @@ msgstr "Arquivo %s não inicia com mensagem assinada simples"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr "Nenhum chaveiro instalado em %s."
+msgstr "Abortando instalação."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3283,14 +3298,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Versão '%s' para '%s' não foi encontrada"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr "Não foi possível encontrar a tarefa '%s'"
+msgstr "Impossível achar tarefa %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "Não foi possível encontrar qualquer pacote pela expressão regular '%s'"
+msgstr "Impossível achar pacote %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3364,9 +3379,9 @@ msgid "Removing %s"
 msgstr "Removendo %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr "Removendo completamente %s"
+msgstr "%s completamente removido"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3385,9 +3400,9 @@ msgid "Directory '%s' missing"
 msgstr "Diretório '%s' está faltando"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir o arquivo '%s'"
+msgstr "Não foi possível abrir arquivo %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3499,11 +3514,9 @@ msgstr ""
 "processo o utilizando?"
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Não foi possível travar o diretório da administração (%s), você é "
-"administrador?"
+msgstr "Impossível criar trava no diretório de listas"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3519,167 +3532,276 @@ msgstr ""
 msgid "Not locked"
 msgstr "Não bloqueado"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Abrindo arquivo de configuração %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Erro de leitura do processo %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Falhou ao remover %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Não foi possível abrir \"pipe\" para %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Impossível criar %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Falhou ao localizar um arquivo de controle válido"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Falhou ao executar \"stat\" em %sinfo."
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Não foi possível mudar para %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Erro analisando MD5. Posição %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Falhou ao mudar para o diretório administrativo %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Seção \"ConfFile\" ruim no arquivo de estado. Posição %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Erro interno obtendo um nome de pacote"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Falhou ao encontrar um Pacote: cabeçalho, posição %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Lendo listagem de arquivos"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "O cache de pacotes deve ser inicializado primeiro"
+#~ 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 ""
+#~ "Falhou ao abrir o arquivo de lista '%sinfo/%s'. Se você não conseguir "
+#~ "restaurar este arquivo, crie-o vazio e imediatamente reinstale a mesma "
+#~ "versão do pacote!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Erro interno ao adicionar um desvio"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Falhou ao ler o arquivo de lista %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Linha inválida no arquivo de desvios: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Erro interno obtendo um nó"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Falhou ao abrir o arquivo de desvios %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "O arquivo de desvios está corrompido"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Falhou ao abrir o arquivo de desvios %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Linha inválida no arquivo de desvios: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Erro interno obtendo um nó"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Erro interno ao adicionar um desvio"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Falhou ao ler o arquivo de lista %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "O cache de pacotes deve ser inicializado primeiro"
 
-#~ 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 ""
-#~ "Falhou ao abrir o arquivo de lista '%sinfo/%s'. Se você não conseguir "
-#~ "restaurar este arquivo, crie-o vazio e imediatamente reinstale a mesma "
-#~ "versão do pacote!"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Falhou ao encontrar um Pacote: cabeçalho, posição %lu"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Lendo listagem de arquivos"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Seção \"ConfFile\" ruim no arquivo de estado. Posição %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Erro interno obtendo um nome de pacote"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Erro analisando MD5. Posição %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Falhou ao mudar para o diretório administrativo %sinfo"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Não foi possível mudar para %s"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Falhou ao localizar um arquivo de controle válido"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Não foi possível abrir \"pipe\" para %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Erro de leitura do processo %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Override malformado %s linha %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Override malformado %s linha %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Override malformado %s linha %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "descompactador"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "escrita, ainda restam %lu para gravar mas não foi possível"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Um erro ocorreu processando %s (NovoPacote)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Um erro ocorreu processando %s (UsePacote1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Um erro ocorreu processando %s (UsePacote2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Um erro ocorreu processando %s (NovaVersão1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Um erro ocorreu processando %s (UsePacote3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Um erro ocorreu processando %s (EncontrarPacote)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Um erro ocorreu processando %s (ColetarArquivoProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Erro interno, não foi possível localizar membro"
+
+#~ msgid "You must give exactly one pattern"
+#~ msgstr "Você deve passar exatamente um padrão"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 #~ msgstr ""
-#~ "Os diretórios info e temp precisam estar no mesmo sistema de arquivos"
+#~ "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo."
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Falhou ao executar \"stat\" em %sinfo."
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Um erro ocorreu processando %s (NovaVersão2)"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Impossível criar %s"
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Falhou ao remover %s"
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Não foi possível acessar o chaveiro: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Não foi possível aplicar o patch"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Use 'apt-get autoremove' para removê-los."
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
 
-#~ 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"
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Erro processando gatilhos para %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "\"MMap\" Dinâmico ficou sem espaço"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "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 ""
-#~ "MMap dinamico ficou sem espaço. Por favor incremente o tamanho do APT::"
-#~ "Cache-Limit. Valor atual: %lu (man 5 apt.conf)"
+#~ "Já que você solicitou uma única operação é bem provável que o pacote\n"
+#~ "esteja simplesmente não instalável e um relatório de bug sobre esse\n"
+#~ "pacote deveria ser enviado."
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Ignorar arquivo inexistente: %s"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linha %d muito longa (máx. %d)"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linha %d muito longa (máx. %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Um erro ocorreu processando %s (NovoArquivoVer1)"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Nota: Isto é feito automaticamente e de propósito pelo dpkg."
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Rótulo armazenado: %s \n"
 
+#, fuzzy
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "Encontrado(s) %i índice(s) de pacote(s), %i índice(s) de fonte(s) e %i "
+#~ "assinaturas\n"
+
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Seleção falhou"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Data do arquivo mudou %s"
+
+#~ msgid "Reading file list"
+#~ msgstr "Lendo Listagem de Pacotes"
+
+#~ msgid "Could not execute "
+#~ msgstr "Não foi possível executar "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparando para remoção de %s e sua configuração"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "%s e sua configuração removidos"
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
 #~ msgstr ""
-#~ "Uso: apt-mark [opção] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark é uma interface de linha de comando simples para a marcação de "
-#~ "pacotes\n"
-#~ "manual ou automaticamente instalados. Ele também pode listar marcações.\n"
-#~ "\n"
-#~ "Comandos:\n"
-#~ "   auto - Marca os pacotes dados como instalados automaticamente\n"
-#~ "   manual - Marca os pacotes dados como instalados manualmente\n"
-#~ "\n"
-#~ "Opções:\n"
-#~ "  -h  texto de ajuda.\n"
-#~ "  -q  Log de saída - sem indicador de progresso\n"
-#~ "  -qq Sem saída, exceto para erros\n"
-#~ "  -s  Sem ação. Apenas imprime o que seria feito.\n"
-#~ "  -f  leitura/escrita automática/manual da marcação em um dado arquivo\n"
-#~ "  -c=? Ler este arquivo de configuração\n"
-#~ "  -o=? Definir uma opção de configuração arbitrária, eg -o dir::cache=/"
-#~ "tmp\n"
-#~ "Veja o manual do apt-mark(8) e apt.conf(5) para mais informações."
+#~ "ID de fornecedor desconhecido '%s' na linha %u da lista de fontes %s"
 
 #~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ "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 ""
-#~ "Uso: apt-internal-resolver\n"
-#~ "\n"
-#~ "O apt-internal-resolver é uma interface para uso interno atual\n"
-#~ "como um resolvedor externo para a família APT para depuração ou "
-#~ "semelhantes\n"
-#~ "\n"
-#~ "Opções:\n"
-#~ "  -h  Este texto de ajuda.\n"
-#~ "  -q  Sair da sessão - sem indicador de progresso\n"
-#~ "  -c=? Ler este arquivo de configuração\n"
-#~ "  -o=? Definir uma opção de configuração arbitrária, por exemplo, -o dir::"
-#~ "cache=/tmp\n"
-#~ "leia página do manual apt.conf (5) para mais informações e opções.\n"
-#~ "                       Este APT tem Poderes de Super Vaca.\n"
+#~ "Alguns pacotes quebrados foram encontrados enquanto se tentava "
+#~ "processar \n"
+#~ "as dependências de construção.\n"
+#~ "Você pode querer rodar 'apt-get -f install' para corrigí-los."
+
+#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
+#~ msgstr ""
+#~ "Desculpe, você não tem espaço livre o suficiente em %s para guardar os ."
+#~ "debs."
+
+#~ msgid "Extract "
+#~ msgstr "extra"
+
+#~ msgid "De-replaced "
+#~ msgstr "Substitui"
+
+#~ msgid "Replaced file "
+#~ msgstr "Substitui"
+
+#~ msgid "Regex compilation error"
+#~ msgstr "Erro de compilação de regex - %s"
+
+#~ msgid "Failed to stat %s%s"
+#~ msgstr "Falha ao baixar %s  %s\n"
+
+#~ msgid "Failed to open %s.new"
+#~ msgstr "Falha ao baixar %s  %s\n"
+
+#~ msgid "Failed to rename %s.new to %s"
+#~ msgstr "Falha ao baixar %s  %s\n"
+
+#~ msgid "Couldn't wait for subprocess"
+#~ msgstr "Não foi possível checar a lista de pacotes fonte %s"
+
+#~ msgid " files "
+#~ msgstr " falhou."
+
+#~ msgid "Done. "
+#~ msgstr "Pronto"
+
+#~ msgid "Could not find a record in the DSC '%s'"
+#~ msgstr "Impossível achar pacote %s"
+
+#~ msgid "Failed too stat %s"
+#~ msgstr "Impossível checar %s."
diff --git a/po/ro.po b/po/ro.po
index d892c141e..7d0788a0c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,17 +8,16 @@ msgstr ""
 "Project-Id-Version: ro\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
-"Last-Translator: Eddy Petrisor <eddy.petrisor@gmail.com>\n"
+"PO-Revision-Date: 2008-11-15 02:21+0200\n"
+"Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
-"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -30,8 +29,9 @@ msgid "Total package names: "
 msgstr "Total nume pachete : "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr "Total structuri pachete: "
+msgstr "Total nume pachete : "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -105,8 +105,9 @@ msgid "No packages found"
 msgstr "Nu s-au găsit pachete"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "Trebuie să introduceți cel puțin un șablon de căutare"
+msgstr "Trebuie să dați exact un șablon"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -120,7 +121,7 @@ msgstr "Nu s-a putut localiza pachetul %s"
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
-msgstr "Fișiere pachet:"
+msgstr "Fișiere pachet: "
 
 #: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
@@ -166,6 +167,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pentru %s compilat la %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,55 +203,55 @@ 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 ""
-"Utilizare: apt-cache [opțiuni] comandă\n"
-"       apt-cache [opțiuni] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [opțiuni] showsrc pkg1 [pkg2 ...]\n"
+"Utilizare: apt-cache [opțiuni] comanda\n"
+"       apt-cache [opțiuni] add fișier1 [fișier2 ...]\n"
+"       apt-cache [opțiuni] showpkg pachet1 [pachet2 ...]\n"
+"       apt-cache [opțiuni] showsrc pachet1 [pachet2 ...]\n"
 "\n"
-"apt-cache este o unealtă de nivel scăzut folosită la interogarea "
-"informației\n"
-"din cache-ul fișierelor binare ale APT\n"
+"apt-cache este o unealtă de nivel scăzut pentru manipularea fișierelor\n"
+"binare din cache-ul APT, și de interogare a informațiilor din ele\n"
 "\n"
 "Comenzi:\n"
-"   gencaches - Construiește pachetele și cache-ul surselor\n"
-"   showpkg - Arată unele informații generale pentru un singur pachet\n"
-"   showsrc - Arată înregistrările sursă\n"
-"   stats - Arată unele statistici de bază\n"
-"   dump - Arată întregul fișier într-o formă concisă\n"
-"   dumpavail - Afișează un fișier disponibil la stdout\n"
-"   unmet - Arată dependențele nerezolvate\n"
-"   search - Caută lista de pachet după un model regex\n"
-"   show - Arată o înregistrare citibilă pentru pachet\n"
-"   depends - Arată informații brute despre dependențele unui pachet\n"
-"   rdepends - Arată informația dependențelor inversă pentru un pachet\n"
-"   pkgnames - Listează numele tuturor pachetelor din sistem\n"
-"   dotty - Generează graficele pachet pentru GraphViz\n"
-"   xvcg - Generează graficele pachet pentru xvcg\n"
-"   policy - Arată configurările politicii\n"
+"   add       - Adaugă un fișier pachet la cache-ul sursă\n"
+"   gencaches - Generează cache-ul de pachete și cache-ul de surse\n"
+"   showpkg   - Arată câteva informații generale pentru un pachet\n"
+"   showsrc   - Arată înregistrările despre sursă\n"
+"   stats     - Arată câteva statistici de bază\n"
+"   dump      - Arată întregul fișier într-o formă concisă\n"
+"   dumpavail - Afișează un fișier disponibil la ieșirea standard\n"
+"   unmet     - Arată dependențele neîndeplinite\n"
+"   search    - Caută în lista de pachete folosind un șablon regex\n"
+"   show      - Arată o înregistrare lizibilă pentru pachet\n"
+"   depends   - Arată informații brute de dependențe pentru un pachet\n"
+"   rdepends  - Arată dependențele inverse pentru un pachet\n"
+"   pkgnames  - Afișează numele tuturor pachetelor din sistem\n"
+"   dotty     - Generează grafice cu pachete pentru GraphViz\n"
+"   xvcg      - Generează grafice cu pachete pentru xvcg\n"
+"   policy    - Arată configurațiile de politici\n"
 "\n"
 "Opțiuni:\n"
-"  -h Acest text de ajutor.\n"
-"  -p=? Cache-ul pachetului.\n"
-"  -s=? Sursa cache-ului.\n"
-"  -q Dezactivează indicatorul de progres.\n"
-"  -i Arată numai dependențele importante pentru comanda unmet.\n"
-"  -c=? Citește acest fișier de configurare.\n"
-"  -o=? Configurează o opțiune de configurare arbitrară,ex -o dir::cache=/"
-"tmp\n"
-"Consultați paginile manualului apt-cache(8) și apt.conf(5) pentru mai multe "
-"informații.\n"
+"  -h   Acest text de ajutor.\n"
+"  -p=? Cache-ul de pachete.\n"
+"  -s=? Cache-ul de surse.\n"
+"  -q   Dezactivează indicatorul de progres.\n"
+"  -i   Arată doar dependențele importante pentru comanda „unmet”.\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
+"Vedeți manualele apt-cache(8) și apt.conf(5) pentru mai multe informații.\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Introduceți un nume pentru acest disc, precum „Disc Debian 5.0.3”"
+msgstr "Furnizați un nume pentru acest disc, de exemplu „Debian 2.1r1 Disk 1”"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Introduceți un disc în unitate și apăsați Enter"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Nu s-a reușit montarea '%s' la '%s'"
+msgstr "Eșec la redenumirea lui %s în %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -398,14 +400,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu instalate sau șterse incomplet.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Notă, selectare '%s' pentru sarcina '%s'\n"
+msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Notă, selectare '%s' pentru regex '%s'\n"
+msgstr "Notă, selectare %s pentru expresie regulată '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -417,8 +419,9 @@ msgid " [Installed]"
 msgstr " [Instalat]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr " [Nu este versiune candidat]"
+msgstr "Versiuni candidat"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -440,9 +443,9 @@ msgid "However the following packages replace it:"
 msgstr "Oricum următoarele pachete îl înlocuiesc:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Pachetul '%s' nu are candidat pentru instalare"
+msgstr "Pachetul %s nu are nici un candidat la instalare"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -451,19 +454,19 @@ msgstr "Pachetele virtuale ca '%s' nu pot fi eliminate\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Notă, se selectează '%s' în loc de '%s'\n"
+msgstr "Notă, se selectează %s în locul lui %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -471,9 +474,9 @@ 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:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Se omite %s, nu este instalat și sunt necesare numai actualizări.\n"
+msgstr "Sar peste %s, este deja instalat și înnoirea nu este activată.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -491,14 +494,14 @@ msgid "%s set to manually installed.\n"
 msgstr "%s este marcat ca fiind instalat manual.\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versiune selectată '%s' (%s) pentru '%s'\n"
+msgstr "Versiune selectată %s (%s) pentru %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versiune selectată '%s' (%s) pentru '%s' datorită '%s'\n"
+msgstr "Versiune selectată %s (%s) pentru %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -673,14 +676,8 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"Pachetul următor a dispărut din sistem deoarece\n"
-"toate fișierele au fost suprascrise de alte pachete:"
 msgstr[1] ""
-"Pachetele următoare au dispărut din sistem deoarece\n"
-"toate fișierele au fost suprascrise de alte pachete:"
 msgstr[2] ""
-"Pachetele următoare au dispărut din sistem deoarece\n"
-"toate fișierele au fost suprascrise de alte pachete:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -692,9 +689,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "Ignoră obiectivele indisponibile ale versiunii '%s' din pachetul '%s'"
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Se alege '%s' ca sursă pachet în detrimentul sursei '%s'\n"
+msgstr "Nu pot determina starea listei surse de pachete %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -739,31 +736,38 @@ msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] "Pachetul următor a fost instalat automat și nu mai este necesar:"
+msgstr[0] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 msgstr[1] ""
-"Pachetele următoare au fost instalate automat și nu mai sunt necesare:"
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 msgstr[2] ""
-"Pachetele următoare au fost instalate automat și nu mai sunt necesare:"
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu pachet a fost instalat automat și nu mai este necesar.\n"
-msgstr[1] "%lu pachete au fost instalate automat și nu mai sunt necesare.\n"
-msgstr[2] "%lu de pachete au fost instalate automat și nu mai sunt necesare.\n"
+msgstr[0] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+msgstr[1] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
+msgstr[2] ""
+"Următoarele pachete au fost instalate automat și nu mai sunt necesare:"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Folosiți 'apt-get autoremove' pentru a le șterge."
+msgstr[1] "Folosiți 'apt-get autoremove' pentru a le șterge."
+msgstr[2] "Folosiți 'apt-get autoremove' pentru a le șterge."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -816,9 +820,9 @@ msgid "Couldn't find package %s"
 msgstr "Nu pot găsi pachetul %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s configurat la instalare automată.\n"
+msgstr "%s este marcat ca fiind instalat manual.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -972,13 +976,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s nu are dependențe înglobate.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"Dependența %s pentru %s nu poate fi satisfăcută deoarece %s nu este permis "
-"pentru pachetele „%s”"
+"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
+"poate fi găsit"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -997,22 +1001,22 @@ msgstr ""
 "prea nou"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"Dependența %s pentru %s nu poate fi satisfăcută deoarece versiunea candidat "
-"a pachetului %s nu satisface necesitățile versiunii"
+"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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"Dependența %s pentru %s nu poate fi satisfăcută deoarece pachetul %s nu are "
-"versiune candidat"
+"Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu "
+"poate fi găsit"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -1029,15 +1033,16 @@ msgid "Failed to process build dependencies"
 msgstr "Eșec la prelucrarea dependențelor de compilare"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Jurnal modificări pentru %s (%s)"
+msgstr "Conectare la %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Module suportate:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1082,51 +1087,48 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
-"Utililzare: apt-get [options] comandă\n"
-"       apt-get [opțiune] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [opțiune] source pkg1 [pkg2 ...]\n"
+"Utilizare: apt-get [opțiuni] comanda\n"
+"         apt-get [opțiuni] install|remove pachet1 [pachet2 ...]\n"
+"         apt-get [opțiuni] source pachet1 [pachet2 ...]\n"
 "\n"
-"apt-get este o interfață simplă pentru linia de comandă, pentru descărcarea "
-"și\n"
-"instalarea pachetelor. Cele mai folosite comenzi sunt update\n"
-"și install\n"
+"apt-get este o simplă interfață în linie de comandă pentru descărcarea și\n"
+"instalarea pachetelor. Cele mai frecvent folosite comenzi sunt update\n"
+"și install.\n"
 "\n"
 "Comenzi:\n"
-"   update - Restabilire liste noi de pachete\n"
-"   upgrade - Efectuează o actualizare\n"
-"   install - Instalează pachete noi (pkg este libc6 nu libc6.deb)\n"
-"   remove - Elimină pachete\n"
-"   autoremove - Elimină automat toate pachetele nefolositoare\n"
-"   purge - Elimină pachetele și fișierele de configurare\n"
-"   source - descarcă arhive sursă\n"
-"   build-dep - Configurează construirea dependențelor pentru sursa de "
-"pachete\n"
-"   dist-upgrade - Actualizare distribuție, vedeți apt-get(8)\n"
-"   dselect-upgrade - Urmărește selecțiile dselect\n"
-"   clean - Șterge arhivele de fișiere descărcate\n"
-"   autoclean - Șterge vechile arhive de fișiere descărcate\n"
-"   check - Verifică dacă acolo nu sunt dependențe defecte\n"
-"   changelog - Descarcă și afișează jurnalul modificărilor pentru pachetul "
-"dat\n"
-"   download - Descarcă pachetul binar în directorul curent\n"
+"   update  - Aduce listele noi de pachete\n"
+"   upgrade - Realizează o înnoire\n"
+"   install - Instalează pachete noi (pachet este libc6, nu libc6.deb)\n"
+"   remove  - Șterge pachete\n"
+"   autoremove - Șterge automat toate pachetele nefolosite\n"
+"   purge      - Șterge și curăță pachete\n"
+"   source     - Descarcă pachete-sursă\n"
+"   build-dep  - Configurează dependențele de compilare pentru\n"
+"                pachetele-sursă\n"
+"   dist-upgrade - Înnoirea distribuției, a se vedea apt-get(8)\n"
+"   dselect-upgrade - Urmează selecțiile dselect\n"
+"   clean      - Șterge fișierele-arhivă descărcate\n"
+"   autoclean  - Șterge fișiere-arhivă descărcate învechite\n"
+"   check      - Verifică dacă există dependențe neîndeplinite\n"
 "\n"
 "Opțiuni:\n"
-"  -h Acest text de ajutor.\n"
-"  -q Ieșire jurnalizabilă - fără indicator de progres\n"
-"  -qq Fără ieșire, excepție pentru erori\n"
-"  -d Numai descărcare - NU instalează sau despachetează arhive\n"
-"  -s Fără acțiune. Rulează o simulare\n"
-"  -y Asumă Da la toate interogările și nu afișa\n"
-"  -f Încearcă să se corecteze un sistem cu dependențe nerezolvate existente\n"
-"  -m Încearcă să continue dacă arhivele sunt negăsite\n"
-"  -u Arată și o listă de pachete actualizate\n"
-"  -v Arată detaliat numerele versiunii\n"
+"  -h  Acest text de ajutor.\n"
+"  -q  Afișare jurnalizabilă - fără indicator de progres\n"
+"  -qq Fără afișare, cu excepția erorilor\n"
+"  -d  Doar descărcare - NU instala sau despacheta arhive\n"
+"  -s  Fără acțiune. Realizează o simulare\n"
+"  -y  Presupune DA ca răspuns la toate întrebările și nu\n"
+"      solicita răspuns\n"
+"  -f  Încearcă corectarea unui sistem cu dependențe corupte\n"
+"  -m  Încearcă continuarea dacă arhivele nu pot fi găsite\n"
+"  -u  Arată o listă de pachete ce pot fi înnoite\n"
+"  -b  Construiește sursa pachetului după aducere\n"
+"  -V  Arată versiunile în mod logoreic\n"
 "  -c=? Citește acest fișier de configurare\n"
-"  -o=? Configurează o opțiune arbitrară de configurare, ex -o dir::cache=/"
-"tmp\n"
-"Consultați manualul apt-get(8), sources.list(5) și apt.conf(5)\n"
-"pentru mai multe informații și opțiuni\n"
-"                       Acest APT are puterile unei supervaci.\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
+"Vedeți manualele apt-get(8), sources.list(5) și apt.conf(5)\n"
+"pentru mai multe informații și opțiuni.\n"
+"                       Acest APT are puterile unei Super Vaci.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1154,7 +1156,7 @@ msgstr "Ignorat "
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "Eroare "
+msgstr "Eroare"
 
 #: cmdline/acqprogress.cc:140
 #, c-format
@@ -1178,29 +1180,29 @@ msgstr ""
 "în unitatea „%s” și apăsați Enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s nu poate fi marcat deoarece nu este instalat.\n"
+msgstr "dar nu este instalat"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s a fost deja configurat pentru instalare manuală.\n"
+msgstr "%s este marcat ca fiind instalat manual.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s a fost deja configurat pentru instalare automată.\n"
+msgstr "%s este marcat ca fiind instalat manual.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s a fost deja configurat în așteptare.\n"
+msgstr "%s este deja la cea mai nouă versiune.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s nu a fost deja în așteptare.\n"
+msgstr "%s este deja la cea mai nouă versiune.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1209,14 +1211,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Așteptat %s, dar n-a fost acolo"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s configurat în așteptare.\n"
+msgstr "%s este marcat ca fiind instalat manual.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Așteptare anulată pentru %s.\n"
+msgstr "Eșec la „open” pentru %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1437,7 +1439,7 @@ msgstr "Interogare"
 
 #: methods/ftp.cc:1119
 msgid "Unable to invoke "
-msgstr "Nu s-a putut invoca "
+msgstr "Nu s-a putut invoca"
 
 #: methods/connect.cc:75
 #, c-format
@@ -1488,14 +1490,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Eșec temporar la rezolvarea lui „%s”"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Ceva ciudat s-a întâmplat la rezolvarea '%s:%s' (%i - %s)"
+msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Nu se poate conecta la %s:%s:"
+msgstr "Nu s-a putut realiza conexiunea cu %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1509,9 +1511,10 @@ msgid "At least one invalid signature was encountered."
 msgstr "Cel puțin o semnătură nevalidă a fost întâlnită."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"Nu s-a putut executa 'gpgv' pentru a verifica semnătura (este gpgv instalat?)"
+"Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1631,9 +1634,9 @@ msgstr "Nu a fost găsit niciun fișier oglindă „%s” "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "Nu se poate citi fișierul oglindă „%s”"
+msgstr "Nu s-a putut deschide fișierul %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1680,13 +1683,15 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Doriți să ștergeți eventualele fișiere .deb descărcate anterior?"
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
-"Au intervenit câteva erori la despachetare. Pachetele care au fost instalate"
+msgstr "S-au produs unele erori în timpul despachetării. Se vor configura"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "vor fi configurate. Acest lucru poate duce la dublarea erorilor"
+msgstr ""
+"pachetele care au fost instalate. Aceasta ar putea rezulta erori duplicate"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1873,12 +1878,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "DB este vechi, se încearcă înnoirea %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Formatul bazei de date nu este valid. Dacă ați actualizat de la o versiune "
-"veche de apt, ștergeți și refaceți baza de date."
+"Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai "
+"veche, ștergeți și recreați baza de date."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1994,19 +2000,19 @@ msgid "Unable to open %s"
 msgstr "Nu s-a putut deschide %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Corecție incorectă pentru linia %s %llu #1"
+msgstr "Înlocuire greșită %s linia %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Corecție incorectă pentru linia %s %llu #2"
+msgstr "Înlocuire greșită %s linia %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Corecție incorectă pentru linia %s %llu #3"
+msgstr "Înlocuire greșită %s linia %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -2059,6 +2065,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Eșec la redenumirea lui %s în %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -2071,6 +2078,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Utilizare: apt-extracttemplates fișier1 [fișier2 ...]\n"
+"\n"
+"apt-extracttemplates este o unealtă pentru extragerea informațiilor \n"
+"de configurare și a șabloanelor dintr-un pachet Debian\n"
+"\n"
+"Opțiuni\n"
+"  -h   Acest text de ajutor.\n"
+"  -t   Impune directorul temporar\n"
+"  -c=? Citește acest fișier de configurare\n"
+"  -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2132,9 +2149,9 @@ msgid "Error reading archive member header"
 msgstr "Eroare la citirea antetului membrului arhivei"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr "Arhiva conține un membru cu antet nevalid, %s"
+msgstr "Antet de membru de arhivă necorespunzător"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2270,22 +2287,24 @@ msgid "Can't mmap an empty file"
 msgstr "Nu s-a putut executa „mmap” cu un fișier gol"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Nu s-a putut duplica descriptorul fișierului %i"
+msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Nu s-a putut face mmap de %llu octeți"
+msgstr "Nu s-a putut face mmap cu %lu octeți"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr "Nu se poate închide mmap"
+msgstr "Nu s-a putut deschide %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "mmap nu a putut fi sincronizat"
+msgstr "Nu s-a putut invoca"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2395,11 +2414,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Eroare de sintaxă %s:%u: directiva clear necesită ca argument un arbore de "
-"opțiuni"
+"Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2473,9 +2491,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Eșec la „stat” pentru CD"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Eroare la închiderea fișierului gzip %s"
+msgstr "Problemă la închiderea fișierului"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2525,9 +2543,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Subprocesul %s a primit o eroare de segmentare."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Sub-procesul %s a recepționat semnalul %u."
+msgstr "Subprocesul %s a primit o eroare de segmentare."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2545,9 +2563,9 @@ msgid "Could not open file %s"
 msgstr "Nu s-a putut deschide fișierul %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Nu s-a putut deschide descriptorul fișierului %d"
+msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2555,32 +2573,32 @@ msgstr "Eșec la crearea IPC-ului pentru subproces"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "Eșec la executarea compresorului "
+msgstr "Eșec la executarea compresorului"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "citit, încă mai este de citit %llu, dar nu a rămas nimic altceva"
+msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "scris, încă mai este de scris %llu, dar nu a rămas nimic altceva"
+msgstr "scriere, încă mai am %lu de scris dar nu pot"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr "Eroare la închiderea fișierului %s"
+msgstr "Problemă la închiderea fișierului"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Eroare la redenumirea fișierului %s în %s"
+msgstr "Problemă în timpul sincronizării fișierului"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Eroare la ștergerea legăturii fișierului %s"
+msgstr "Problemă la dezlegarea fișierului"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2599,8 +2617,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Fișierul cache al pachetului este o versiune incompatibilă"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "Fișierul cache pentru pachete e corupt, este prea mic"
+msgstr "Cache-ul fișierului pachet este deteriorat"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2704,30 +2723,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Nu s-a putut analiza fișierul pachet %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Linie coruptă %lu în lista de surse %s ([opțiune] necitibilă)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linie coruptă %lu în lista de surse %s ([opțiune] prea scurtă)"
+msgstr "Linie greșită %lu în lista sursă %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Linie coruptă %lu în lista de surse %s ([%s] nu e o atribuire)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linie coruptă %lu în lista de surse %s ([%s] nu are cheie)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Linie coruptă %lu în lista de surse %s ([%s] cheia %s nu are o valoare)"
+msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2784,9 +2802,9 @@ msgstr ""
 "detalii consultați man 5 apt.conf din  APT::Immediate-Configure. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr "Nu se poate configura „%s”. "
+msgstr "Nu s-a putut deschide fișierul %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2825,27 +2843,28 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nu pot corecta problema, ați ținut pachete deteriorate."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Unele fișiere index nu au putut fi descărcate. Acestea vor fi ignorate, sau "
-"se vor folosi în schimb cele vechi."
+"Descărcarea unor fișiere index a eșuat, acestea fie au fost ignorate, fie au "
+"fost folosite în loc unele vechi."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr "Dosarul cu listări %spartial lipsește."
+msgstr "Directorul de liste %spartial lipsește."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr "Dosarul cu arhive %spartial lipsește."
+msgstr "Directorul de arhive %spartial lipsește."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr "Nu se poate bloca dosarul %s"
+msgstr "Nu pot încuia directorul cu lista"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2918,11 +2937,9 @@ msgstr ""
 "astfel de versiune nu este disponibilă în surse."
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
-"Înregistrare nevalidă în fișierul cu preferințe %s, nu există antete pentru "
-"pachet"
+msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2947,9 +2964,9 @@ msgstr "Cache are un versioning system incompatibil"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "A apărut o eroare la procesarea %s (%s%d)"
+msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -3020,9 +3037,9 @@ msgstr ""
 "greșită în sources.list sau linie coruptă)"
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Nu se poate găsi suma de control pentru „%s” în fișierul Release"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3090,14 +3107,14 @@ msgid "Size mismatch"
 msgstr "Nepotrivire dimensiune"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Nu se poate citi fișierul Release %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr "Nicio secțiune în fișierul Release %s"
+msgstr "Notă, se selectează %s în locul lui %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -3105,14 +3122,14 @@ msgid "No Hash entry in Release file %s"
 msgstr "Nicio sumă de control în fișierul Release %s"
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Intrare nevalidă „Valid-Until” în fișierul Release %s"
+msgstr "Linie necorespunzătoare în fișierul-redirectare: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Intrare nevalidă „Date” în fișierul Release %s"
+msgstr "Nu s-a putut analiza fișierul pachet %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3135,7 +3152,7 @@ msgstr "Identificare.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Etichetă memorată: %s\n"
+msgstr "Etichetă memorată: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3237,9 +3254,9 @@ msgid "Can't find authentication record for: %s"
 msgstr "Nu se poate găsi înregistrarea de autentificare pentru: %s"
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Nepotrivire sumă de control pentru: %s"
+msgstr "Nepotrivire la suma de căutare"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3248,9 +3265,9 @@ msgstr "Fișierul %s nu pornește cu un mesaj semnat clar"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr "Nu este instalat niciun inel de chei în %s."
+msgstr "Abandonez instalarea."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3263,14 +3280,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Versiunea '%s' pentru '%s' n-a fost găsită"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr "Nu se poate găsi sarcina „%s”"
+msgstr "Nu s-a putut găsi sarcina %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "Nu se poate găsi niciun pachet după regex „%s”"
+msgstr "Nu pot găsi pachetul %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3344,9 +3361,9 @@ msgid "Removing %s"
 msgstr "Se șterge %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr "Se șterge complet %s"
+msgstr "Șters complet %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3365,9 +3382,9 @@ msgid "Directory '%s' missing"
 msgstr "Directorul „%s” lipsește."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr "Nu se poate deschide fișierul „%s”"
+msgstr "Nu s-a putut deschide fișierul %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3481,9 +3498,9 @@ msgstr ""
 "proces?"
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Nu se poate bloca dosarul de administrare (%s), sunteți root?"
+msgstr "Nu pot încuia directorul cu lista"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3499,20 +3516,9 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nu este blocat"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Eroare de citire din procesul %s"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "Eroare internă la preluarea unui nod"
-
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Eroare internă la preluarea numelui de pachet"
-
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Pachetul %s nu este instalat, așa încât nu este șters\n"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Folosiți 'apt-get autoremove' pentru a le șterge."
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Se deschide fișierul de configurare %s"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "Eșec la ștergerea lui %s"
@@ -3531,6 +3537,9 @@ msgstr "Nu este blocat"
 #~ msgstr ""
 #~ "Eșec la schimbarea directorului către directorul de administrare %sinfo"
 
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Eroare internă la preluarea numelui de pachet"
+
 #~ msgid "Reading file listing"
 #~ msgstr "Se citește lista de fișiere"
 
@@ -3546,6 +3555,9 @@ msgstr "Nu este blocat"
 #~ msgid "Failed reading the list file %sinfo/%s"
 #~ msgstr "Citirea fișierului-listă %sinfo/%s a eșuat"
 
+#~ msgid "Internal error getting a node"
+#~ msgstr "Eroare internă la preluarea unui nod"
+
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Eșec la deschiderea fișierului de redirectări %sdiversions"
 
@@ -3581,89 +3593,129 @@ msgstr "Nu este blocat"
 #~ msgid "Couldn't open pipe for %s"
 #~ msgstr "Nu s-a putut deschide conexiunea pentru %s"
 
+#~ msgid "Read error from %s process"
+#~ msgstr "Eroare de citire din procesul %s"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "S-a primit o singură linie de antet de peste %u caractere"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Notă: Aceasta este făcută automat și în acest scop de dpkg."
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Înlocuire greșită %s linia %lu #1"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Înlocuire greșită %s linia %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Înlocuire greșită %s linia %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "decompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "scriere, încă mai am %lu de scris dar nu pot"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Eroare apărută în timpul procesării %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Eroare apărută în timpul procesării %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Eroare apărută în timpul procesării %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "A apărut o eroare în timpul procesării lui %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Eroare apărută în timpul procesării %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Eroare internă, nu a putut fi localizat membrul"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 #~ msgstr ""
-#~ "Utilizare: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver este o interfață pentru utilizarea unui rezolvator\n"
-#~ "intern în detrimentul unui rezolvator extern pentru depanatorul din "
-#~ "familia APT\n"
-#~ "\n"
-#~ "Opțiuni:\n"
-#~ "  -h  Acest text de ajutor.\n"
-#~ "  -q  Ieșire jurnalizabilă - fără indicator de desfășurare\n"
-#~ "  -c=? Citește acest fișier de configurare\n"
-#~ "  -o=? Stabilește o opțiune arbitrară de configurare, de ex -o dir::"
-#~ "cache=/tmp\n"
-#~ "Pentru mai multe informații și opțiuni consultați manualul apt.conf(5).\n"
-#~ "                       Acest APT are puterile unei supervaci.\n"
+#~ "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Nu s-a putut accesa inelul de chei: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nu s-a putut peteci fișierul"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "        %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Se procesează declanșatorii pentru %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "MMap-ul dinamic a rămas fără spațiu"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "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 ""
-#~ "Utilizare: apt-mark [opțiuni] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark este o interfață simplă pentru linia de comandă, pentru marcarea "
-#~ "pachetelor\n"
-#~ "ca instalate manual sau automat. Poate deasemenea lista marcajele.\n"
-#~ "\n"
-#~ "Comenzi:\n"
-#~ "   auto - Marchează pachetele date ca instalate automat\n"
-#~ "   manual - Marchează pachetele date ca instalate manual\n"
-#~ "\n"
-#~ "Opțiuni\n"
-#~ "  -h Acest text de ajutor.\n"
-#~ "  -q Ieșire jurnalizată - fără indicator de progres\n"
-#~ "  -qq Fără ieșire, excepție pentru erori\n"
-#~ "  -s Nici o acțiune. Doar afișează ce se va face.\n"
-#~ "  -f citește/scrie automat/manual marcarea în fișierul dat\n"
-#~ "  -c=? Citește acest fișier de configurare\n"
-#~ "  -o=? Configurează o opțiune de configurare arbitrară, ex -o dir::cache=/"
-#~ "tmp\n"
-#~ "Consultați paginile manualului apt-mark(8) și apt.conf(5) pentru mai "
-#~ "multe informații."
+#~ "Din moment ce doar ați cerut o singură operațiune este extrem de "
+#~ "probabil\n"
+#~ " că pachetul pur și simplu nu este instalabil și un raport de eroare "
+#~ "pentru\n"
+#~ "acest pachet ar trebui completat."
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linia %d e prea lungă (max %lu)"
 
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linie %d prea lungă (max %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Etichetă memorată: %s \n"
+
+#, fuzzy
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
 #~ msgstr ""
-#~ "MMap dinamic a rămas fără spațiu. Măriți dimensiunea APT::Cache-Limit. "
-#~ "Valoarea curentă: %lu. (man 5 apt.conf)"
+#~ "Găsite %i indexuri de pachete, %i indexuri de surse și %i semnături\n"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Se omite fișierul inexistent %s"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Eșuarea selecției"
diff --git a/po/ru.po b/po/ru.po
index 274b42bd9..f0d7693da 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -14,17 +14,16 @@ msgstr ""
 "Project-Id-Version: apt rev2227.1.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
+"PO-Revision-Date: 2012-06-30 08:47+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: cmdline/apt-cache.cc:158
@@ -34,7 +33,7 @@ msgstr "Пакет %s версии %s имеет неудовлетворённ�
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "Всего имён пакетов : "
+msgstr "Всего имён пакетов: "
 
 #: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
@@ -572,7 +571,7 @@ msgstr "Внутренняя ошибка, Ordering не завершилась"
 
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "Странно.. Несовпадение размеров, напишите на apt@packages.debian.org"
+msgstr "Странно. Несовпадение размеров, напишите на apt@packages.debian.org"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -657,7 +656,7 @@ msgstr "Некоторые файлы скачать не удалось"
 
 #: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
 msgid "Download complete and in download only mode"
-msgstr "Указан режим \"только скачивание\", и скачивание завершено"
+msgstr "Указан режим «только скачивание», и скачивание завершено"
 
 #: cmdline/apt-get.cc:1379
 msgid ""
@@ -843,7 +842,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Расчёт обновлений… "
+msgstr "Расчёт обновлений…"
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -1167,7 +1166,7 @@ msgstr "Игн "
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "Ош "
+msgstr "Ош  "
 
 #: cmdline/acqprogress.cc:140
 #, c-format
@@ -1660,7 +1659,7 @@ msgstr "Невозможно сменить текущий каталог на %
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Файл «%s» не найден на зеркале "
+msgstr "Файл «%s» не найден на зеркале"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1971,7 +1970,7 @@ msgstr "Не удалось открыть %s"
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
@@ -2044,7 +2043,7 @@ msgstr "Неправильная запись о переназначении (o
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "Не удалось прочесть файл переназначений (override)%s"
+msgstr "Не удалось прочесть файл переназначений (override) %s"
 
 #: ftparchive/multicompress.cc:70
 #, c-format
@@ -2837,7 +2836,7 @@ msgstr ""
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr "Не удалось настроить «%s». "
+msgstr "Не удалось настроить «%s»."
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2999,20 +2998,25 @@ msgstr "Произошла ошибка во время обработки %s (%
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Превышено допустимое количество имён пакетов."
+msgstr ""
+"Превышено допустимое количество имён пакетов, которое способен обработать "
+"APT."
 
 #: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Превышено допустимое количество версий."
+msgstr ""
+"Превышено допустимое количество версий, которое способен обработать APT."
 
 #: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
-"Вах, превышено допустимое количество описаний, с которым может работать APT."
+"Превышено допустимое количество описаний, которое способен обработать APT."
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Превышено допустимое количество зависимостей."
+msgstr ""
+"Превышено допустимое количество зависимостей, которое способен обработать "
+"APT."
 
 #: apt-pkg/pkgcachegen.cc:523
 #, c-format
@@ -3172,7 +3176,7 @@ msgstr "Идентификация.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Найдена метка: %s\n"
+msgstr "Найдена метка: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3538,170 +3542,172 @@ msgstr ""
 msgid "Not locked"
 msgstr "Не заблокирован"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Получен заголовок длиннее %u символов"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Пропускается несуществующий файл %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Ошибка чтения из процесса %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Не удалось удалить %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Не удалось открыть канал для %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Не удалось создать %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Не удалось найти правильный control-файл"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Не удалось получить атрибуты %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Не удалось перейти в каталог %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Каталоги info и temp должны находиться на одной файловой системе"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Ошибка чтения контрольной суммы. Смещение %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr ""
+#~ "Не удалось сменить текущий каталог на административный каталог %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Неверная секция ConfFile в status-файле. Смещение %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Внутренняя ошибка при получении имени пакета"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Не удалось найти заголовок Package:, смещение %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Чтение списков файлов в пакете"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Внутренняя ошибка при добавлении diversion"
+#~ 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». Если вы не сможете "
+#~ "восстановить этот файл, то обнулите его и немедленно переустановите ту же "
+#~ "версию пакета!"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Неверная строка в файле diversions: %s"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Ошибка чтения списка файлов %sinfo/%s"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Файл diversions повреждён"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Внутренняя ошибка при получении node"
 
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Не удалось открыть файл diversions %sdiversions"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Внутренняя ошибка при получении node"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Файл diversions повреждён"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Ошибка чтения списка файлов %sinfo/%s"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Неверная строка в файле diversions: %s"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Чтение списков файлов в пакете"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Внутренняя ошибка при добавлении diversion"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Внутренняя ошибка при получении имени пакета"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "В первую очередь должен быть инициализирован кэш пакетов"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr ""
-#~ "Не удалось сменить текущий каталог на административный каталог %sinfo"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Не удалось найти заголовок Package:, смещение %lu"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Каталоги info и temp должны находиться на одной файловой системе"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Неверная секция ConfFile в status-файле. Смещение %lu"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Не удалось получить атрибуты %sinfo"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Ошибка чтения контрольной суммы. Смещение %lu"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Не удалось создать %s"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Не удалось перейти в каталог %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Не удалось удалить %s"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Не удалось найти правильный control-файл"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Пакет %s не установлен, поэтому не может быть удалён\n"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Не удалось открыть канал для %s"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. "
-#~ "Текущее значение: %lu. (man 5 apt.conf)"
+#~ msgid "Read error from %s process"
+#~ msgstr "Ошибка чтения из процесса %s"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Пропускается несуществующий файл %s"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Получен заголовок длиннее %u символов"
 
 #~ msgid "Note: This is done automatic and on purpose by dpkg."
 #~ msgstr "Замечание: это сделано автоматически и специально программой dpkg."
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "В первую очередь должен быть инициализирован кэш пакетов"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Неправильная запись о переназначении (override) %s на строке %lu #1"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Неправильная запись о переназначении (override) %s на строке %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Неправильная запись о переназначении (override) %s на строке %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "декомпрессор"
+
+#~ msgid "read, still have %lu to read but none left"
 #~ msgstr ""
-#~ "Использование: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver представляет собой интерфейс для использования "
-#~ "внутреннего\n"
-#~ "распознавателя, как внешнего, для семейства APT, для отладки или по "
-#~ "необходимости\n"
-#~ "\n"
-#~ "Параметры:\n"
-#~ "  -h  Эта справка.\n"
-#~ "  -q  Ведение событий журнала - без индикатора выполнения\n"
-#~ "  -c=? Прочитать этот конфигурационный файл\n"
-#~ "  -o=? Назначить произвольный конфигурационный параметр, например -o dir::"
-#~ "cache=/tmp\n"
-#~ "Для получения дополнительных сведений о apt.conf(5) обратитесь в "
-#~ "руководство пользователя.\n"
-#~ "                       Вся мощь APT.\n"
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Для их удаления используйте «apt-get autoremove»."
+#~ "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Использование: apt-mark [параметры] {auto|manual} пакет1 [пакет2…]\n"
-#~ "\n"
-#~ "apt-mark — простая программа с интерфейсом командной строки\n"
-#~ "для отметки пакетов, что они установлены вручную или автоматически.\n"
-#~ "Также может показывать списки помеченных пакетов.\n"
-#~ "\n"
-#~ "Команды:\n"
-#~ "   auto - пометить указанные пакеты, как установленные автоматически\n"
-#~ "   manual - пометить указанные пакеты, как установленные вручную\n"
-#~ "\n"
-#~ "Параметры:\n"
-#~ "  -h   эта справка\n"
-#~ "  -q   показывать сообщения о работе, не выводить индикатор хода работы\n"
-#~ "  -qq  показывать только сообщения об ошибках\n"
-#~ "  -s   не выполнять действия на самом деле, только имитация работы\n"
-#~ "  -f   читать/писать данные о пометках в заданный файл\n"
-#~ "  -c=? читать указанный файл настройки\n"
-#~ "  -o=? задать значение произвольному параметру настройки,\n"
-#~ "       например, -o dir::cache=/tmp\n"
-#~ "В справочных страницах apt-mark(8) и apt.conf(5)\n"
-#~ "содержится подробная информация и описание параметров."
+#~ "Не удалось выполнить оперативную настройку уже распакованного «%s». "
+#~ "Подробней, смотрите в man 5 apt.conf о APT::Immediate-Configure."
 
-#~ 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!"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Произошла ошибка во время обработки %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Произошла ошибка во время обработки %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Произошла ошибка во время обработки %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Произошла ошибка во время обработки %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Произошла ошибка во время обработки %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Внутренняя ошибка, не удалось найти составную часть"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Внутренняя ошибка, группа %s не устанавливается псевдо-пакетом"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
 #~ msgstr ""
-#~ "Не удалось открыть список файлов «%sinfo/%s». Если вы не сможете "
-#~ "восстановить этот файл, то обнулите его и немедленно переустановите ту же "
-#~ "версию пакета!"
+#~ "Файл Release просрочен, игнорируется %s (недостоверный начиная с %s)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr ""
+#~ "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение "
+#~ "работы."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Произошла ошибка во время обработки %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Искажённая строка %u в списке источников %s (vendor id)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Нет доступа к связке (keyring) ключей: '%s'"
+
+#, fuzzy
+#~| msgid "Could not open file %s"
+#~ msgid "Could not patch file"
+#~ msgstr "Не удалось открыть файл %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
diff --git a/po/sk.po b/po/sk.po
index e97e39c6a..206fdb718 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,16 +11,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
-"Last-Translator: helix84 <Unknown>\n"
+"PO-Revision-Date: 2012-06-28 20:49+0100\n"
+"Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -152,7 +150,7 @@ msgstr "(žiadna)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  Pripevnený balík: "
+msgstr "  Pripevnený balík:"
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -623,7 +621,7 @@ msgid ""
 msgstr ""
 "Možno sa chystáte vykonať niečo škodlivé.\n"
 "Ak chcete pokračovať, opíšte frázu „%s“\n"
-" ?] "
+" ?]"
 
 #: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
 msgid "Abort."
@@ -674,10 +672,10 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"Nasledovné balíky zmizli z vášho systému, pretože\n"
+"Nasledovný balík zmizol z vášho systému, pretože\n"
 "všetky súbory boli prepísané inými balíkmi:"
 msgstr[1] ""
-"Nasledovný balík zmizol z vášho systému, pretože\n"
+"Nasledovné balíky zmizli z vášho systému, pretože\n"
 "všetky súbory boli prepísané inými balíkmi:"
 msgstr[2] ""
 "Nasledovné balíky zmizli z vášho systému, pretože\n"
@@ -744,9 +742,9 @@ msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] ""
-"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
-msgstr[1] ""
 "Nasledovný balík bol nainštalovaný automaticky a už viac nie je potrebný:"
+msgstr[1] ""
+"Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 msgstr[2] ""
 "Nasledovné balíky boli nainštalované automaticky a už viac nie sú potrebné:"
 
@@ -756,17 +754,17 @@ msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
 msgstr[0] ""
-"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
-msgstr[1] ""
 "%lu balík bol nainštalovaný automaticky a už viac nie je potrebný.\n"
+msgstr[1] ""
+"%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 msgstr[2] ""
 "%lu balíkov bolo nainštalovaných automaticky a už viac nie sú potrebné.\n"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Na ich odstránenie použite „apt-get autoremove“."
-msgstr[1] "Na jeho odstránenie použite „apt-get autoremove“."
+msgstr[0] "Na jeho odstránenie použite „apt-get autoremove“."
+msgstr[1] "Na ich odstránenie použite „apt-get autoremove“."
 msgstr[2] "Na ich odstránenie použite „apt-get autoremove“."
 
 #: cmdline/apt-get.cc:1854
@@ -1634,7 +1632,7 @@ msgstr "Nedá sa prejsť do %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Na zrkadle nebol nájdený súbor „%s“ "
+msgstr "Na zrkadle nebol nájdený súbor „%s“"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
@@ -1966,7 +1964,7 @@ msgstr "Archív neobsahuje pole „package“"
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
 msgid "  %s has no override entry\n"
-msgstr "  %s nemá žiadnu položku override\n"
+msgstr " %s nemá žiadnu položku override\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
@@ -1976,12 +1974,12 @@ msgstr "  správcom %s je %s, nie %s\n"
 #: ftparchive/writer.cc:721
 #, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s nemá žiadnu položku „source override“\n"
+msgstr " %s nemá žiadnu položku „source override“\n"
 
 #: ftparchive/writer.cc:725
 #, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s nemá žiadnu položku „binary override“\n"
+msgstr " %s nemá žiadnu položku „binary override“\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -2458,7 +2456,7 @@ msgstr "Voľba „%s“ je príliš dlhá"
 #: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Sense %s is not understood, try true or false."
-msgstr "Nezrozumiteľný význam %s, skúste true alebo false."
+msgstr "Nezrozumiteľný význam %s, skúste true alebo false. "
 
 #: apt-pkg/contrib/cmndline.cc:350
 #, c-format
@@ -2788,7 +2786,7 @@ msgstr ""
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr "Nedá sa nakonfigurovať „%s“. "
+msgstr "Nedá sa nakonfigurovať „%s“."
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -3116,12 +3114,12 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Identifikuje sa.. "
+msgstr "Identifikuje sa.."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Uložená menovka: %s\n"
+msgstr "Uložená menovka: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3474,137 +3472,147 @@ msgstr "dpkg bol prerušený, musíte ručne opraviť problém spustením „%s�
 msgid "Not locked"
 msgstr "Nie je zamknuté"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Preskakuje sa neexistujúci súbor %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Chyba pri čítaní z procesu %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Odstránenie %s zlyhalo"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Nedá sa otvoriť rúra pre %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Nedá sa vytvoriť %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Nedá sa nájsť platný riadiaci súbor"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Vyhodnotenie %sinfo zlyhalo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Nedá sa prejsť do %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Chyba pri spracovaní MD5. Pozícia %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Nedá sa zmeniť na admin adresár %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Vnútorná chyba pri získavaní názvu balíka"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Chyba pri hľadaní Balíka: hlavička, pozícia %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Načítava sa zoznam súborov"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
+#~ 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 ""
+#~ "Otvorenie súboru zoznamov „%sinfo/%s“ zlyhalo. Ak nemôžete obnoviť tento "
+#~ "súbor, vytvorte nový prázdny a ihneď znovu nainštalujte tú istú verziu "
+#~ "balíka!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Vnútorná chyba pri pridávaní diverzie"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Neplatný riadok v diverznom súbore: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Vnútorná chyba pri získavaní uzla"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Diverzný súbor je porušený"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Zlyhalo otvorenie súboru s diverziami %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Neplatný riadok v diverznom súbore: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Vnútorná chyba pri získavaní uzla"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Vnútorná chyba pri pridávaní diverzie"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Chyba pri čítaní súboru so zoznamami %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Vyrovnávacia pamäť balíkov sa musí najprv inicializovať"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Načítava sa zoznam súborov"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Chyba pri hľadaní Balíka: hlavička, pozícia %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Vnútorná chyba pri získavaní názvu balíka"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Zlá sekcia ConfFile v stavovom súbore na pozícii %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Nedá sa zmeniť na admin adresár %sinfo"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Chyba pri spracovaní MD5. Pozícia %lu"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Adresáre info a temp musia byť na tom istom súborovom systéme"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Nedá sa prejsť do %s"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Vyhodnotenie %sinfo zlyhalo"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Nedá sa nájsť platný riadiaci súbor"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Nedá sa vytvoriť %s"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Nedá sa otvoriť rúra pre %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Odstránenie %s zlyhalo"
+#~ msgid "Read error from %s process"
+#~ msgstr "Chyba pri čítaní z procesu %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Balík %s nie je nainštalovaný, nedá sa teda odstrániť\n"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Získal sa jeden riadok hlavičky cez %u znakov"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Na ich odstránenie použite „apt-get autoremove“."
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
 
-#~ 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 ""
-#~ "Otvorenie súboru zoznamov „%sinfo/%s“ zlyhalo. Ak nemôžete obnoviť tento "
-#~ "súbor, vytvorte nový prázdny a ihneď znovu nainštalujte tú istú verziu "
-#~ "balíka!"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Skomolený „override“ %s riadok %lu #1"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Nedostatok miesta pre dynamický MMap. Prosím, zväčšite veľkosť APT::Cache-"
-#~ "Limit. Aktuálna hodnota: %lu. (man 5 apt.conf)"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Skomolený „override“ %s riadok %lu #2"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Preskakuje sa neexistujúci súbor %s"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Skomolený „override“ %s riadok %lu #3"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Pozn.: Toto robí dpkg automaticky a zámerne."
+#~ msgid "decompressor"
+#~ msgstr "dekompresor"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "čítanie, stále treba prečítať %lu, ale už nič neostáva"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "zápis, stále treba zapísať %lu, no nedá sa to"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Použitie: apt-mark [voľby] {auto|manual} balík1 [balík2 ...]\n"
-#~ "\n"
-#~ "apt-mark je jednoduché rozhranie príkazového riadka na označovanie\n"
-#~ "balíkov ako manuálne alebo automaticky nainštalované.\n"
-#~ "Tiež dokáže označenia vypisovať.\n"
-#~ "\n"
-#~ "Príkazy:\n"
-#~ "   auto - Označí uvedené balíky ako automaticky nainštalované\n"
-#~ "   manual - Označí uvedené balíky ako manuálne nainštalované\n"
-#~ "\n"
-#~ "Voľby:\n"
-#~ "  -h  Tento text pomocníka.\n"
-#~ "  -q  Výstup vhodný do záznamu - bez indikátora priebehu\n"
-#~ "  -qq Nevypisovať nič, len chyby\n"
-#~ "  -s  Nevykonávať zmeny. Iba vypísať, čo by sa urobilo.\n"
-#~ "  -f  čítanie/zápis označenia auto/manálne v uvedenom súbore\n"
-#~ "  -c=? Načítať tento konfiguračný súbor\n"
-#~ "  -o=? Nastaviť ľubovoľný konfiguračnú voľbu, napr. -o dir::cache=/tmp\n"
-#~ "Ďalšie informácie nájdete na manuálových stránkach apt-mark(8) a apt.conf"
-#~ "(5)."
+#~ "Nebolo možné vykonať okamžitú konfiguráciu už rozbaleného „%s“. Pozri "
+#~ "prosím podrobnosti v man 5 apt.conf pod APT::Immediate-Configure"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Chyba pri spracovávaní %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Chyba pri spracovávaní %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Chyba pri spracovávaní %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Chyba pri spracovávaní %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Chyba pri spracovávaní %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Vyskytla sa chyba pri spracovávaní %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Chyba pri spracovávaní %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Vyskytla sa chyba pri spracovávaní %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Chyba pri spracovávaní %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Chyba pri spracovávaní %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Vnútorná chyba, nedá sa nájsť člen"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Vnútorná chyba, skupina „%s“ nemá žiaden inštalovateľný pseudobalík"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Platnosť súboru Release vypršala, ignoruje sa %s (neplatný od %s)"
diff --git a/po/sl.po b/po/sl.po
index cd47abf85..3dd53fbda 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:16+0000\n"
+"PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
@@ -14,8 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Launchpad-Export-Date: 2012-06-25 20:00+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -3481,44 +3481,17 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
 msgid "Not locked"
 msgstr "Ni zaklenjeno"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Ni mogoče spremeniti v %s"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Napačna izbira ConfFile v datoteki stanja. Odmik %lu"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Datoteka z odklonom je pokvarjena"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo"
-
-#~ msgid "Reading file listing"
-#~ msgstr "Branje seznama datotek"
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Določitev %sinfo ni uspela"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Ni mogoče ustvariti %s"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Preskok neobstoječe datoteke %s"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "Odstranitev %s ni uspela"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Paket %s ni nameščen, zato ni odstranjen\n"
-
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Opomba: To je dpkg storil samodejno in namenoma."
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni mogoče ustvariti %s"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Uporabite 'apt-get autoremove' za njihovo odstranitev."
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Določitev %sinfo ni uspela"
 
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr "Podatki in začasne mape morajo biti na istem datotečnem sistemu"
@@ -3529,6 +3502,9 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Internal error getting a package name"
 #~ msgstr "Notranja napaka med dobivanjem imena paketa"
 
+#~ msgid "Reading file listing"
+#~ msgstr "Branje seznama datotek"
+
 #~ 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 "
@@ -3538,9 +3514,18 @@ msgstr "Ni zaklenjeno"
 #~ "obnoviti datoteke, jo izpraznite in takoj znova namestite enako različico "
 #~ "paketa!"
 
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo"
+
 #~ msgid "Internal error getting a node"
 #~ msgstr "Notranja napaka med dobivanjem vozlišča"
 
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Datoteka z odklonom je pokvarjena"
+
 #~ msgid "Invalid line in the diversion file: %s"
 #~ msgstr "Neveljavna vrstica v datoteki z odklonom: %s"
 
@@ -3553,9 +3538,15 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Failed to find a Package: header, offset %lu"
 #~ msgstr "Napaka med iskanjem paketa: glava, odmik %lu"
 
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Napačna izbira ConfFile v datoteki stanja. Odmik %lu"
+
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "Napaka med razčlenjevanjem MD5. Odmik %lu"
 
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Ni mogoče spremeniti v %s"
+
 #~ msgid "Failed to locate a valid control file"
 #~ msgstr "Ni mogoče najti veljavne nadzorne datoteke"
 
@@ -3565,81 +3556,60 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Read error from %s process"
 #~ msgstr "Napaka med branjem iz opravila %s"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Omejitev-"
-#~ "Predpomnilnika. Trenutna vrednost: %lu. (man 5 apt.conf)"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Preskok neobstoječe datoteke %s"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Uporaba: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver je vmesnik za uporabo trenutnega notranjega\n"
-#~ "reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
-#~ "podobno.\n"
-#~ "\n"
-#~ "Možnosti:\n"
-#~ "  -h To besedilo pomoči\n"
-#~ "  -q Izhod se beleži - ni kazalnika napredka\n"
-#~ "  -c=? Prebere to nastavitveno datoteko\n"
-#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
-#~ "Oglejte si strani priročnika apt.conf(5) za več podrobnosti in možnosti.\n"
-#~ "                       Ta APT ima moči super krave.\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "program za razširjanje"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "branje, še vedno %lu za branje, a nobeden ni ostal"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Nov paket)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Nova različica datoteke 1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovaRazličica%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Prišlo je do napake med obdelavo %s  (Najdi paket)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Zberi dobavitelje datotek)"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
-#~ "\n"
-#~ "apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n"
-#~ "kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiše.\n"
-#~ "\n"
-#~ "Ukazi:\n"
-#~ "   auto - Označi dane pakete kot samodejno nameščene\n"
-#~ "  manual - Označi dane pakete kot ročno nameščene\n"
-#~ "\n"
-#~ "Možnosti:\n"
-#~ "  -h To besedilo pomoči.\n"
-#~ "  -q Izhod se beleži - brez kazalnika napredka\n"
-#~ "  -qq Brez izhoda razen napak\n"
-#~ "  -s Ne naredi ničesar. Samo napiše kaj bi bilo narejeno.\n"
-#~ "  -f Prebere/zapiše oznako ročno/samodejno za dano datoteko\n"
-#~ "  -c=? Prebere to nastavitveno datoteko\n"
-#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/"
-#~ "tmp\n"
-#~ "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf"
-#~ "(5)."
+#~ "Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si "
+#~ "man 5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti"
diff --git a/po/sv.po b/po/sv.po
index 1316c079a..334e370de 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,16 +10,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:19+0000\n"
-"Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
+"PO-Revision-Date: 2010-08-24 21:18+0100\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -166,6 +164,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s för %s kompilerad den %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,6 +200,42 @@ 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 ""
+"Användning: apt-cache [flaggor] kommando\n"
+"            apt-cache [flaggor] add fil1 [fil2 ...]\n"
+"            apt-cache [flaggor] showpkg paket1 [paket2 ...]\n"
+"            apt-cache [flaggor] showsrc paket1 [paket2 ...]\n"
+"\n"
+"apt-cache är ett lågnivåverktyg för att hantera APTs binära cachefiler\n"
+"samt hämta information från dem\n"
+"\n"
+"Kommandon:\n"
+"   add - Lägg till en paketfil till källcachen\n"
+"   gencaches - Bygg både paket- och källcache\n"
+"   showpkg - Visa viss allmän information om ett enskilt paket\n"
+"   showsrc - Visa källkodsposter\n"
+"   stats - Visa viss grundläggande statistik\n"
+"   dump - Visa hela filen i koncis form\n"
+"   dumpavail - Skriv en \"available\"-fil på standard ut\n"
+"   unmet - Visa otillfredsställbara beroenden\n"
+"   search - Sök i paketlistan med ett reguljärt uttryck\n"
+"   show - Visa en läsbar post för paketet\n"
+"   showauto - Visa en lista över automatiskt installerade paket\n"
+"   depends - Visa rå information om beroenden för ett paket\n"
+"   rdepends - Visa information om omvända beroenden för ett paket\n"
+"   pkgnames - Lista namnen på alla paket i systemet\n"
+"   dotty - Generera paketdiagram för GraphViz\n"
+"   xvcg - Generera paketdiagram för xvcg\n"
+"   policy - Visa policyinställningar\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -p=? Paketcachen.\n"
+"  -s=? Källcachen.\n"
+"  -q   Inaktivera förloppsindikatorn.\n"
+"  -i   Visa endast viktiga beroenden för \"unmet\"-kommandot.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+"Se manualsidorna för apt-cache(8) och apt.conf(5) för mer information.\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -414,14 +449,14 @@ msgstr "Virtuella paket som \"%s\" kan inte tas bort\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -462,9 +497,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Valde version \"%s\" (%s) för \"%s\" på grund av \"%s\"\n"
+msgstr "Valde version \"%s\" (%s) för \"%s\"\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -724,10 +759,11 @@ msgstr[1] ""
 "%lu paket blev installerade automatiskt och är inte längre nödvändiga.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Använd \"apt-get autoremove\" för att ta bort dem."
+msgstr[1] "Använd \"apt-get autoremove\" för att ta bort dem."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -841,16 +877,15 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 "Använd:\n"
-"bzr branch %s\n"
-"för att hämta de senaste (möjligen inte utgivna) uppdateringarna för "
-"paketet.\n"
+"bzr get %s\n"
+"för att hämta senaste (möjligen inte utgivna) uppdateringar av paketet.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -933,13 +968,13 @@ msgid "%s has no build depends.\n"
 msgstr "%s har inga byggberoenden.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"%s beroende för %s kan inte tillfredsställas eftersom %s inte tillåts på \"%s"
-"\"-paket"
+"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
+"hittas"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -958,22 +993,22 @@ msgstr ""
 "paketet %s är för nytt"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"%s beroende för %s kan inte tillfredsställas eftersom kandidatversionen av "
-"paketet %s inte kan tillfredsställa versionskraven"
+"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga "
+"versioner av paketet %s tillfredsställer versionskraven"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"%s beroende för %s kan inte tillfredsställas eftersom paketet %s inte har en "
-"kandidatversion"
+"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan "
+"hittas"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -989,16 +1024,18 @@ msgstr "Byggberoenden för %s kunde inte tillfredsställas."
 msgid "Failed to process build dependencies"
 msgstr "Misslyckades med att behandla byggberoenden"
 
+# Felmeddelande för misslyckad chdir
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Ändringslogg för %s (%s)"
+msgstr "Ansluter till %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Moduler som stöds:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1043,6 +1080,47 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Användning: apt-get [flaggor] kommando\n"
+"       apt-get [flaggor] install|remove paket1 [paket2 ...]\n"
+"       apt-get [flaggor] source paket1 [paket2 ...]\n"
+"\n"
+"apt-get är ett enkelt kommandoradsgränssnitt för att hämta och installera\n"
+"paket. De mest använda kommandona är \"update\" och \"install\".\n"
+"\n"
+"Kommandon:\n"
+"   update - Hämta nya paketlistor\n"
+"   upgrade - Genomför en uppgradering\n"
+"   install - Installera nya paket (paket är libc6, inte libc6.deb)\n"
+"   remove - Ta bort paket\n"
+"   autoremove - Ta automatiskt bort alla oanvända paket\n"
+"   purge - Ta bort paket och konfigurationsfiler\n"
+"   source - Hämta källkodsarkiv\n"
+"   build-dep - Tillfredsställ byggberoenden för källkodspaket\n"
+"   dist-upgrade - Uppgradering av distributionen, se apt-get(8)\n"
+"   dselect-upgrade - Följ valen från dselect\n"
+"   clean - Ta bort hämtade arkivfiler\n"
+"   autoclean - Ta bort gamla hämtade arkivfiler\n"
+"   check - Kontrollera att det inte finns några trasiga beroenden\n"
+"   markauto - Markera angivna paket som automatiskt installerade\n"
+"   unmarkauto - Markera angivna paket som manuellt installerade\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -q   Utdata lämplig för loggar - ingen förloppsindikator.\n"
+"  -qq  Ingen utdata förutom vid fel.\n"
+"  -d   Bara hämta - VARKEN installera eller packa upp arkiven.\n"
+"  -s   Gör ingenting, simulera vad som skulle hända.\n"
+"  -y   Antag ja på alla frågor utan att fråga.\n"
+"  -f   Försök rätta ett system med otillfredsställda beroenden.\n"
+"  -m   Försök fortsätta även om arkiven inte kan hittas.\n"
+"  -u   Visa även en lista över uppgraderade paket.\n"
+"  -b   Bygg källkodspaketet när det hämtats.\n"
+"  -V   Visa pratsamma versionsnummer.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
+"Se manualsidorna för apt-get(8), sources.list(5) och apt.conf(5)\n"
+"för mer information och flaggor.\n"
+"                     Denna APT har Speciella Ko-Krafter.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1099,29 +1177,29 @@ msgstr ""
 "i enheten \"%s\" och tryck på Enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s kan inte markeras eftersom det inte är installerat.\n"
+msgstr "men det är inte installerat"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s är redan inställt som manuellt installerat.\n"
+msgstr "%s är satt till manuellt installerad.\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s är redan inställt som automatiskt installerat.\n"
+msgstr "%s är satt till automatiskt installerad.\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s var redan inställd att hållas kvar.\n"
+msgstr "%s är redan den senaste versionen.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s var redan inställd att inte hållas kvar.\n"
+msgstr "%s är redan den senaste versionen.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1130,14 +1208,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Väntade på %s men den fanns inte där"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s är inställd att hållas kvar.\n"
+msgstr "%s är satt till manuellt installerad.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Avbröt kvarhållning för %s.\n"
+msgstr "Misslyckades med att öppna %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1465,7 +1543,7 @@ msgstr "Felaktig rubrikrad"
 
 #: methods/http.cc:569 methods/http.cc:576
 msgid "The HTTP server sent an invalid reply header"
-msgstr "Http-servern skickade en ogiltig svarsrubrik"
+msgstr "Http-servern sände ett ogiltigt svarshuvud"
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
@@ -1513,7 +1591,7 @@ msgstr "Fel vid läsning från server"
 
 #: methods/http.cc:1194
 msgid "Bad header data"
-msgstr "Felaktiga data i rubrik"
+msgstr "Felaktiga data i huvud"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
@@ -1553,9 +1631,9 @@ msgstr "Ingen spegelfil \"%s\" hittades "
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "Kan inte läsa spegelfilen \"%s\""
+msgstr "Ingen spegelfil \"%s\" hittades "
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1912,20 +1990,21 @@ msgstr "realloc - Misslyckades med att allokera minne"
 msgid "Unable to open %s"
 msgstr "Kunde inte öppna %s"
 
+# parametrar: filnamn, radnummer
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Felformaterad åsidosättning %s rad %llu #1"
+msgstr "Felaktig override %s rad %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Felformaterad åsidosättning %s rad %llu #2"
+msgstr "Felaktig override %s rad %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Felformaterad åsidosättning %s rad %llu #3"
+msgstr "Felaktig override %s rad %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1979,6 +2058,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Misslyckades med att byta namn på %s till %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1991,6 +2071,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Användning: apt-extracttemplates fil1 [fil2 ...]\n"
+"\n"
+"apt-extracttemplates är ett verktyg för att hämta ut konfigurations- \n"
+"och mallinformation från paket\n"
+"\n"
+"Flaggor:\n"
+"  -h   Denna hjälptext.\n"
+"  -t   Ställ in temporärkatalogen.\n"
+"  -c=? Läs denna konfigurationsfil.\n"
+"  -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2026,7 +2116,7 @@ msgstr "Misslyckades med att skapa rör"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Misslyckades med att köra gzip "
+msgstr "Misslyckades med att köra gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2189,9 +2279,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Kunde inte duplicera filhandtag %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Kunde inte göra mmap av %llu byte"
+msgstr "Kunde inte utföra mmap på %lu byte"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2472,14 +2562,14 @@ msgid "Failed to exec compressor "
 msgstr "Misslyckades med att starta komprimerare "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "läsning, har fortfarande %llu att läsa men inget är kvar"
+msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "skrivning. har fortfarande %llu att skriva men kan inte"
+msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2514,8 +2604,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Paketcachefilens version är inkompatibel"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "Paketlagringsfilen är skadad; den är för liten"
+msgstr "Paketcachefilen är skadad"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2700,9 +2791,9 @@ msgstr ""
 "under APT::Immediate-Configure för information. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr "Kunde inte konfigurera \"%s\". "
+msgstr "Kunde inte öppna filen \"%s\""
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2741,12 +2832,13 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
-"Några indexfiler gick inte att hämta. De kommer att ignoreras eller så "
-"används de gamla istället."
+"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
+"använts istället."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2850,6 +2942,7 @@ msgstr "Prioritet ej angiven (eller noll) för nål"
 msgid "Cache has an incompatible versioning system"
 msgstr "Cachen har ett inkompatibelt versionssystem"
 
+# NewPackage etc. är funktionsnamn
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
 #: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
@@ -2860,9 +2953,9 @@ msgstr "Cachen har ett inkompatibelt versionssystem"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Fel uppstod vid behandling av %s (%s%d)"
+msgstr "Fel uppstod vid hantering av %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2928,9 +3021,9 @@ msgstr ""
 "sources.list eller felformulerad fil)"
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Kunde inte hitta kontrollsumma för \"%s\" i Release-filen"
+msgstr "Kunde inte tolka \"Release\"-filen %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3040,7 +3133,7 @@ msgstr "Identifierar.. "
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Lagrad etikett: %s\n"
+msgstr "Lagrad etikett: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
@@ -3399,99 +3492,175 @@ msgstr ""
 msgid "Not locked"
 msgstr "Inte låst"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Fick en ensam rubrikrad på %u tecken"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Hoppar över icke-existerande filen %s"
 
-# %s = programnamn
-#~ msgid "Read error from %s process"
-#~ msgstr "Läsfel från %s-processen"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Misslyckades med att ta bort %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Kunde inte öppna rör för %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Kunde inte skapa %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Misslyckades med att hitta en giltig control-fil"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Misslyckades att ta status på %sinfo"
+
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Katalogerna info och temp måste vara på samma filsystem"
+
+# Felmeddelande för misslyckad chdir
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Misslyckades att växla till adminkatalogen %sinfo"
+
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Internt fel när namn på Package-fil skulle hämtas"
+
+#~ msgid "Reading file listing"
+#~ msgstr "Läser fillista"
+
+#~ 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 med att öppna listfilen \"%sinfo/%s\". Om du inte kan "
+#~ "återskapa filen, skapa en tom och installera omedelbart om samma version "
+#~ "av paketet!"
+
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Misslyckades med att läsa listfilen %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "Internt fel när en nod skulle hämtas"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Misslyckades med att öppna omdirigeringsfilen %sdiversions"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Omdirigeringsfilen är skadad"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Felaktig rad i omdirigeringsfilen: %s"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Internt fel när en omdirigering skulle läggas till"
+
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Paketcachen måste först initieras"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Misslyckades med att hitta Package:-rubrik, position %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Fel vid tolkning av MD5. Position %lu"
 
 # chdir
 #~ msgid "Couldn't change to %s"
 #~ msgstr "Kunde inte byta till %s"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Fel vid tolkning av MD5. Position %lu"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Misslyckades med att hitta en giltig control-fil"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Kunde inte öppna rör för %s"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Paketcachen måste först initieras"
+# %s = programnamn
+#~ msgid "Read error from %s process"
+#~ msgstr "Läsfel från %s-processen"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Internt fel när en omdirigering skulle läggas till"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Fick en ensam rubrikrad på %u tecken"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Felaktig rad i omdirigeringsfilen: %s"
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Omdirigeringsfilen är skadad"
+# parametrar: filnamn, radnummer
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Felaktig override %s rad %lu #1"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Misslyckades med att öppna omdirigeringsfilen %sdiversions"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Felaktig override %s rad %lu #2"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Internt fel när en nod skulle hämtas"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Felaktig override %s rad %lu #3"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Misslyckades med att läsa listfilen %sinfo/%s"
+#~ msgid "decompressor"
+#~ msgstr "uppackare"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
 #~ 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!"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Misslyckades med att öppna listfilen \"%sinfo/%s\". Om du inte kan "
-#~ "återskapa filen, skapa en tom och installera omedelbart om samma version "
-#~ "av paketet!"
+#~ "Kunde inte genomföra omedelbar konfiguration på redan uppackade \"%s\". "
+#~ "Se man 5 apt.conf under APT::Immediate-Configure för information."
 
-#~ msgid "Reading file listing"
-#~ msgstr "Läser fillista"
+# NewPackage etc. är funktionsnamn
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewPackage)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Internt fel när namn på Package-fil skulle hämtas"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Fel uppstod vid hantering av %s (UsePackage1)"
 
-# Felmeddelande för misslyckad chdir
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Misslyckades att växla till adminkatalogen %sinfo"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Katalogerna info och temp måste vara på samma filsystem"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Fel uppstod vid hantering av %s (UsePackage2)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Misslyckades att ta status på %sinfo"
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewFileVer1)"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Kunde inte skapa %s"
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Fel uppstod vid behandling av %s (NewVersion%d)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Misslyckades med att ta bort %s"
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Fel uppstod vid hantering av %s (UsePackage3)"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Använd \"apt-get autoremove\" för att ta bort dem."
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Paketet %s är inte installerat, så det tas inte bort\n"
+# NewPackage etc. är funktionsnamn
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Fel uppstod vid hantering av %s (FindPkg)"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Internt fel, kunde inte hitta del"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Internt fel, gruppen \"%s\" har inget installerbart pseudo-paket"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release-filen har gått ut, ignorerar %s (ogiltig sedan %s)"
+
+#~ msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+#~ msgstr "F: För många nyckelringar skulle skickas till gpgv. Avslutar."
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 #~ msgstr ""
-#~ "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. "
-#~ "Aktuellt värde: %lu. (man 5 apt.conf)"
+#~ "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar."
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Misslyckades med att hitta Package:-rubrik, position %lu"
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Rad %u i källistan %s har fel format (leverantörs-id)"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Hoppar över icke-existerande filen %s"
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Fel uppstod vid hantering av %s (NewVersion2)"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Observera: Detta sker med automatik och vid behov av dpkg."
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Kunde inte komma åt nyckelring: \"%s\""
+
+#~ msgid "Could not patch file"
+#~ msgstr "Kunde inte lägga på programfix på filen"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
diff --git a/po/th.po b/po/th.po
index b77c00d2f..d76dda936 100644
--- a/po/th.po
+++ b/po/th.po
@@ -1,7 +1,7 @@
 # Thai translation of apt.
-# Copyright (C) 2007-2008 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the apt package.
-# Theppiak Karoonboonyanan <thep@linux.thai.net>, 2007-2008.
+# Theppiak Karoonboonyanan <thep@linux.thai.net>, 2007-2008, 2012.
 # Arthit Suriyawongkul <arthit@gmail.com>, 2008.
 #
 msgid ""
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:18+0000\n"
+"PO-Revision-Date: 2012-10-27 22:44+0700\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "Language: th\n"
@@ -17,8 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -27,11 +25,11 @@ msgstr "แพกเกจ %s รุ่น %s ขาดแพกเกจที�
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "จำนวนชื่อแพกเกจทั้งหมด : "
+msgstr "จำนวนชื่อแพกเกจทั้งหมด: "
 
 #: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
-msgstr ""
+msgstr "จำนวนโครงสร้างแพกเกจทั้งหมด: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -106,11 +104,11 @@ msgstr "ไม่พบแพกเกจ"
 
 #: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "คุณต้องระบุแพตเทิร์นสำหรับค้นหาอย่างน้อยหนึ่งแพตเทิร์น"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark showauto' แทน"
 
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
@@ -199,10 +197,43 @@ 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"
+"\n"
+"apt-cache เป็นเครื่องมือระดับล่างสำหรับสืบค้นข้อมูลจากแฟ้มแคชไบนารีของ APT\n"
+"\n"
+"คำสั่ง:\n"
+"   gencaches - สร้างทั้งแคชของแพกเกจและแคชของซอร์ส\n"
+"   showpkg - แสดงข้อมูลทั่วไปของแพกเกจที่กำหนด\n"
+"   showsrc - แสดงระเบียนข้อมูลซอร์ส\n"
+"   stats - แสดงสถิติทั่วไป\n"
+"   dump - แสดงเนื้อหาแคชทั้งหมดในรูปแบบดิบ\n"
+"   dumpavail - แสดงข้อมูลแพกเกจที่มีทั้งหมดออกทางเอาต์พุตมาตรฐาน\n"
+"   unmet - แสดงความเชื่อมโยงที่ยังขาดหาย\n"
+"   search - ค้นรายชื่อแพกเกจด้วยนิพจน์เรกิวลาร์\n"
+"   show - แสดงข้อมูลของแพกเกจ\n"
+"   depends - แสดงข้อมูลแพกเกจที่ต้องใช้สำหรับแพกเกจที่กำหนด\n"
+"   rdepends - แสดงข้อมูลแพกเกจอื่นที่ต้องใช้แพกเกจที่กำหนด\n"
+"   pkgnames - แสดงรายชื่อแพกเกจทั้งหมด\n"
+"   dotty - สร้างกราฟความเชื่อมโยงของแพกเกจในรูป GraphViz\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"
+"กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-cache(8) และ apt.conf(5)\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "กรุณาตั้งชื่อแผ่น เช่น 'Debian 5.0.3 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
@@ -211,7 +242,7 @@ msgstr "กรุณาใส่แผ่นลงในไดรว์แล้
 #: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "ไม่สามารถเมานท์ '%s' ที่ '%s'"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -255,7 +286,7 @@ msgstr "Y"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -361,12 +392,12 @@ msgstr "ติดตั้งหรือถอดถอนไม่ครบ %l
 #: cmdline/apt-get.cc:635
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "หมายเหตุ: จะเลือก '%s' สำหรับงานติดตั้ง '%s'\n"
 
 #: cmdline/apt-get.cc:640
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "หมายเหตุ: จะเลือก '%s' สำหรับนิพจน์เรกิวลาร์ '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -379,7 +410,7 @@ msgstr " [ติดตั้งอยู่]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr ""
+msgstr " [ไม่ใช่รุ่นสำหรับติดตั้ง]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -402,28 +433,28 @@ msgstr "อย่างไรก็ดี แพกเกจต่อไปน�
 #: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "แพกเกจ '%s' ไม่มีรุ่นที่จะใช้ติดตั้ง"
 
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "แพกเกจเสมือนอย่าง '%s' ไม่สามารถถอดถอนได้\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน คุณหมายถึง '%s' หรือเปล่า?\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "หมายเหตุ: จะเลือก '%s' แทน '%s'\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -433,7 +464,7 @@ msgstr "จะข้าม %s เนื่องจากแพกเกจต�
 #: cmdline/apt-get.cc:822
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "จะข้าม %s เนื่องจากแพกเกจไม่ได้ติดตั้งไว้ และคำสั่งมีเพียงการปรับรุ่นเท่านั้น\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -453,12 +484,12 @@ msgstr "กำหนด %s ให้เป็นการติดตั้ง�
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว\n"
 
 #: cmdline/apt-get.cc:889
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "เลือกรุ่น '%s' (%s) สำหรับ '%s' แล้ว อันเนื่องมาจาก '%s'\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -588,7 +619,7 @@ msgstr "เลิกทำ"
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]? "
+msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -631,27 +662,28 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-msgstr[1] ""
+"แพกเกจต่อไปนี้ได้หายไปจากระบบของคุณ เพราะแฟ้มทั้งหมดได้ถูกแทนที่\n"
+"โดยแพกเกจอื่นแล้ว:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+msgstr "หมายเหตุ: นี่เป็นสิ่งที่ dpkg ทำโดยอัตโนมัติโดยเจตนา"
 
 #: cmdline/apt-get.cc:1559
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "จะละเลยรุ่นเป้าหมาย '%s' ซึ่งไม่มีอยู่ของแพกเกจ '%s'"
 
 #: cmdline/apt-get.cc:1591
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "จะเลือก '%s' เป็นแพกเกจซอร์สแทน '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "จะละเลยรุ่น '%s' ที่ไม่มีอยู่ของแพกเกจ '%s'"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
@@ -693,22 +725,19 @@ msgid ""
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:"
 
 #: cmdline/apt-get.cc:1833
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "มีแพกเกจ %lu แพกเกจถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว\n"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ใช้ 'apt-get autoremove' เพื่อถอดถอนแพกเกจดังกล่าวได้"
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -761,13 +790,13 @@ msgstr "ไม่พบแพกเกจ %s"
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "กำหนด %s ให้เป็นการติดตั้งแบบอัตโนมัติแล้ว\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
-msgstr ""
+msgstr "คำสั่งนี้ไม่แนะนำให้ใช้แล้ว กรุณาใช้ 'apt-mark auto' และ 'apt-mark manual' แทน"
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
@@ -792,12 +821,12 @@ msgstr "ไม่สามารถล็อคไดเรกทอรีดา
 #: cmdline/apt-get.cc:2386
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgstr "ไม่พบแหล่งที่จะดาวน์โหลดรุ่น '%s' ของ '%s' ได้"
 
 #: cmdline/apt-get.cc:2391
 #, c-format
 msgid "Downloading %s %s"
-msgstr ""
+msgstr "กำลังดาวน์โหลด %s %s"
 
 #: cmdline/apt-get.cc:2451
 msgid "Must specify at least one package to fetch source for"
@@ -814,6 +843,8 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
+"ข้อสังเกต: การจัดทำแพกเกจ '%s' พัฒนาผ่านระบบควบคุมรุ่น '%s' อยู่ที่:\n"
+"%s\n"
 
 #: cmdline/apt-get.cc:2513
 #, c-format
@@ -822,6 +853,9 @@ msgid ""
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"กรุณาใช้:\n"
+"bzr branch %s\n"
+"เพื่อดึงรุ่นล่าสุด (ที่อาจยังไม่ปล่อยออกมา) ของตัวแพกเกจ\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -890,6 +924,7 @@ msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
+"ไม่มีข้อมูลสถาปัตยกรรมสำหรับ %s ดูวิธีตั้งค่าที่หัวข้อ APT::Architectures ของ apt.conf(5)"
 
 #: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
 #, c-format
@@ -907,6 +942,7 @@ msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่สามารถใช้ %s กับแพกเกจ '%s' ได้"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -926,13 +962,15 @@ msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s "
+"รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้"
 
 #: cmdline/apt-get.cc:3094
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะ %s ไม่มีรุ่นที่ติดตั้งได้"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -951,7 +989,7 @@ msgstr "ติดตั้งสิ่งที่จำเป็นสำหร
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "ปูมการแก้ไขสำหรับ %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
@@ -1002,6 +1040,47 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"วิธีใช้:  apt-get [ตัวเลือก] คำสั่ง\n"
+"       apt-get [ตัวเลือก] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [ตัวเลือก] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get เป็นคำสั่งง่ายๆ สำหรับดาวน์โหลดและติดตั้งแพกเกจ คำสั่งที่ใช้บ่อยที่สุดก็คือ\n"
+"update และ install\n"
+"\n"
+"คำสั่ง:\n"
+"   update - ดาวน์โหลดรายชื่อแพกเกจชุดใหม่\n"
+"   upgrade - ปรับรุ่นแพกเกจต่างๆ ขึ้น\n"
+"   install - ติดตั้งแพกเกจใหม่ (pkg อยู่ในรูปเช่น libc6 ไม่ใช่ libc6.deb)\n"
+"   remove - ถอดถอนแพกเกจ\n"
+"   autoremove - ถอดถอนแพกเกจที่ไม่ใช้แล้วโดยอัตโนมัติ\n"
+"   purge - ถอดถอนแพกเกจพร้อมลบค่าตั้งทั้งหมด\n"
+"   source - ดาวน์โหลดซอร์สโค้ดของแพกเกจ\n"
+"   build-dep - ติดตั้งสิ่งที่จำเป็นสำหรับการประกอบสร้างแพกเกจซอร์สโค้ด\n"
+"   dist-upgrade - ปรับรุ่นขึ้นแบบข้ามรุ่นจัดแจก ดู apt-get(8)\n"
+"   dselect-upgrade - ทำตามสิ่งที่เลือกโดย dselect\n"
+"   clean - ลบแฟ้มแพกเกจที่ดาวน์โหลดมา\n"
+"   autoclean - ลบแฟ้มแพกเกจเก่าที่ดาวน์โหลดมา\n"
+"   check - ตรวจสอบว่าไม่มีความเชื่อมโยงที่เสียระหว่างแพกเกจ\n"
+"   changelog - ดาวน์โหลดและแสดงปูมการแก้ไขของแพกเกจที่กำหนด\n"
+"   download - ดาวน์โหลดแพกเกจไบนารีลงในไดเรกทอรีปัจจุบัน\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h  แสดงข้อความช่วยเหลือนี้\n"
+"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
+"  -qq ไม่ต้องแสดงผลลัพธ์ ยกเว้นข้อผิดพลาด\n"
+"  -d  ดาวน์โหลดอย่างเดียว - *ไม่ต้อง* ติดตั้งหรือแตกแพกเกจ\n"
+"  -s  ไม่ต้องทำจริง เพียงจำลองลำดับการทำงานเท่านั้น\n"
+"  -y  ตอบ Yes สำหรับทุกคำถามโดยไม่ต้องถาม\n"
+"  -f  พยายามแก้ไขระบบในกรณีที่มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ\n"
+"  -m  พยายามดำเนินการต่อถ้าหาแฟ้มแพกเกจไม่พบ\n"
+"  -u  แสดงรายชื่อของแพกเกจที่จะปรับรุ่นทั้งหมดด้วย\n"
+"  -b  build แพกเกจซอร์สหลังจากดาวน์โหลดมาแล้วด้วย\n"
+"  -V  แสดงเลขรุ่นแบบยาวของโปรแกรม\n"
+"  -c=? อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+"กรุณาอ่านข้อมูลและตัวเลือกเพิ่มเติมจาก manual page apt-get(8), sources.list(5)\n"
+"และ apt.conf(5)\n"
+"                       APT นี้มีพลังของ Super Cow\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1010,6 +1089,10 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
+"หมายเหตุ: นี่เป็นเพียงการจำลองการทำงานเท่านั้น!\n"
+"         การทำงานจริงของ apt-get ต้องอาศัยสิทธิ์ผู้ดูแลระบบ\n"
+"         อย่าลืมด้วยว่าการล็อคก็ไม่ทำงานเช่นกัน\n"
+"         ดังนั้น อย่าถือผลลัพธ์นี้ว่าตรงกับสภาพความเป็นจริงของระบบ!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1051,27 +1134,27 @@ msgstr ""
 #: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "%s ไม่สามารถทำเครื่องหมายได้ เพราะไม่ได้ติดตั้งไว้\n"
 
 #: cmdline/apt-mark.cc:61
 #, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบเลือกเองอยู่ก่อนแล้ว\n"
 
 #: cmdline/apt-mark.cc:63
 #, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s ถูกกำหนดให้เป็นการติดตั้งแบบอัตโนมัติอยู่ก่อนแล้ว\n"
 
 #: cmdline/apt-mark.cc:228
 #, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s ถูกกำหนดให้คงรุ่นอยู่ก่อนแล้ว\n"
 
 #: cmdline/apt-mark.cc:230
 #, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s ไม่ได้คงรุ่นอยู่ก่อนแล้ว\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1082,16 +1165,16 @@ msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม�
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
 #, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "กำหนด %s ให้คงรุ่นแล้ว\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
 #, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "ยกเลิกการคงรุ่นของ %s แล้ว\n"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+msgstr "เรียกทำงาน dpkg ไม่สำเร็จ คุณเป็น root หรือเปล่า?"
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1114,6 +1197,23 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
+"วิธีใช้: apt-mark [ตัวเลือก] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark เป็นเครื่องมือบรรทัดคำสั่งอย่างง่ายสำหรับทำเครื่องหมายแพกเกจ\n"
+"ว่าเป็นการติดตั้งแบบเลือกเองหรือแบบอัตโนมัติ และสามารถแสดงการทำเครื่องหมายต่างๆ ได้ด้วย\n"
+"\n"
+"คำสั่ง:\n"
+"   auto - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบอัตโนมัติ\n"
+"   manual - ทำเครื่องหมายแพกเกจที่กำหนดให้เป็นการติดตั้งแบบเลือกเอง\n"
+"ตัวเลือก:\n"
+"  -h  แสดงข้อความช่วยเหลือนี้\n"
+"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
+"  -qq ไม่ต้องแสดงผลลัพธ์ ยกเว้นข้อผิดพลาด\n"
+"  -s  ไม่ต้องทำจริง เพียงจำลองลำดับการทำงานเท่านั้น\n"
+"  -f  อ่าน/เขียน เครื่องหมาย อัตโนมัติ/เลือกเอง ในแฟ้มที่กำหนด\n"
+"  -c=? อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
+"กรุณาอ่านข้อมูลเพิ่มเติมจาก manual page apt-mark(8) และ apt.conf(5)"
 
 #: methods/cdrom.cc:203
 #, c-format
@@ -1355,12 +1455,12 @@ msgstr "เกิดข้อผิดพลาดชั่วคราวขณ
 #: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
 
 #: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "ไม่สามารถเชื่อมต่อไปยัง %s:%s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1373,7 +1473,7 @@ msgstr "พบลายเซ็นที่ใช้การไม่ได้
 
 #: methods/gpgv.cc:189
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
+msgstr "ไม่สามารถเรียก 'gpgv' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1391,7 +1491,7 @@ msgstr "ลายเซ็นต่อไปนี้ไม่สามารถ
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr ""
+msgstr "แฟ้มว่างเปล่าไม่สามารถเป็นแฟ้มจัดเก็บที่ใช้การได้"
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1485,26 +1585,26 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "ไม่พบแฟ้มแหล่งสำเนา '%s'"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
 #, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "ไม่สามารถอ่านแฟ้มแหล่งสำเนา '%s'"
 
 #: methods/mirror.cc:442
 #, c-format
 msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[แหล่งสำเนา: %s]"
 
 #: methods/rred.cc:491
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
-msgstr ""
+msgstr "ไม่สามารถปรับแก้ %s ด้วย mmap และการกระทำแฟ้ม - ดูเหมือนแพตช์จะเสีย"
 
 #: methods/rred.cc:496
 #, c-format
@@ -1512,6 +1612,7 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
+"ไม่สามารถปรับแก้ %s ด้วย mmap (แต่ไม่พบข้อผิดพลาดที่เจาะจงเฉพาะ mmap) - ดูเหมือนแพตช์จะเสีย"
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
@@ -1536,11 +1637,11 @@ msgstr "คุณต้องการจะลบแฟ้ม .deb ต่าง
 
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดขณะแตกแพกเกจ โปรแกรมจะตั้งค่าแพกเกจที่ติดตั้งแล้ว"
 
 #: dselect/install:102
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "อาจทำให้เกิดข้อความแจ้งข้อผิดพลาดซ้ำ หรือข้อผิดพลาดเนื่องจากแพกเกจที่ต้องใช้ขาดหาย"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1553,7 +1654,7 @@ msgstr "กรุณาแก้ปัญหาเหล่านั้น แ�
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "กำลังผสานรายชื่อแพกเกจที่มี"
+msgstr "กำลังผสานรายชื่อของแพกเกจที่มี"
 
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
@@ -1717,7 +1818,7 @@ msgstr "DB เป็นรุ่นเก่า จะพยายามปร�
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
-msgstr ""
+msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่"
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1835,17 +1936,17 @@ msgstr "ไม่สามารถเปิด %s"
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
 #, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
 #, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
 #, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %llu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1910,6 +2011,17 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"วิธีใช้: apt-internal-solver\n"
+"\n"
+"apt-internal-solver "
+"เป็นเครื่องมือสำหรับเรียกใช้กลไกภายในปัจจุบันเสมือนเป็นกลไกการแก้ปัญหาภายนอกสำหรับโปรแกรมตระกูล "
+"APT เพื่อการดีบั๊กหรืออะไรทำนองนี้\n"
+"\n"
+"ตัวเลือก:\n"
+"  -h  แสดงข้อความช่วยเหลือนี้\n"
+"  -q  แสดงผลลัพธ์แบบบันทึกลงแฟ้มได้ - ไม่ต้องแสดงความคืบหน้า\n"
+"  -c=?  อ่านแฟ้มค่าตั้งนี้\n"
+"  -o=?  กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1945,7 +2057,7 @@ msgstr "สร้างไปป์ไม่สำเร็จ"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "เรียก gzip ไม่สำเร็จ "
+msgstr "เรียก gzip ไม่สำเร็จ"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -1962,28 +2074,28 @@ msgstr "พบชนิด %u ของข้อมูลส่วนหัว T
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
-msgstr "เอกลักษณ์ archive ไม่ถูกต้อง"
+msgstr "เอกลักษณ์ของแฟ้มจัดเก็บไม่ถูกต้อง"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
-msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิก archive"
+msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บ"
 
 #: apt-inst/contrib/arfile.cc:94
 #, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "ข้อมูลส่วนหัว %s ของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
-msgstr "ข้อมูลส่วนหัวของสมาชิก archive ไม่ถูกต้อง"
+msgstr "ข้อมูลส่วนหัวของสมาชิกแฟ้มจัดเก็บไม่ถูกต้อง"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
-msgstr "archive สั้นเกินไป"
+msgstr "แฟ้มจัดเก็บสั้นเกินไป"
 
 #: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
-msgstr "อ่านข้อมูลส่วนหัวของ archive ไม่สำเร็จ"
+msgstr "อ่านข้อมูลส่วนหัวของแฟ้มจัดเก็บไม่สำเร็จ"
 
 #: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
@@ -2105,20 +2217,20 @@ msgstr "ไม่สามารถ mmap แฟ้มเปล่า"
 #: apt-pkg/contrib/mmap.cc:111
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "ไม่สามารถทำซ้ำ file descriptor %i"
 
 #: apt-pkg/contrib/mmap.cc:119
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "ไม่สามารถสร้าง mmap ขนาด %llu ไบต์"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "ไม่สามารถปิด mmap"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "ไม่สามารถปรับ mmap ให้ตรงกัน"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2135,42 +2247,44 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
+"MMap แบบพลวัตมีเนื้อที่ไม่พอ กรุณาเพิ่มขนาดของ APT::Cache-Start  ค่าปัจจุบัน: %lu (man 5 "
+"apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:440
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
-msgstr ""
+msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากถึงขีดจำกัด %lu ไบต์แล้ว"
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+msgstr "ไม่สามารถเพิ่มขนาดของ MMap เนื่องจากผู้ใช้ปิดการขยายขนาดอัตโนมัติ"
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:372
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%liวัน %liชม. %liนาที %liวิ"
 
 #. h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:379
 #, c-format
 msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%liชม. %liนาที %liวิ"
 
 #. min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:386
 #, c-format
 msgid "%limin %lis"
-msgstr ""
+msgstr "%liนาที %liวิ"
 
 #. s means seconds
 #: apt-pkg/contrib/strutl.cc:391
 #, c-format
 msgid "%lis"
-msgstr ""
+msgstr "%liวิ"
 
 #: apt-pkg/contrib/strutl.cc:1167
 #, c-format
@@ -2225,7 +2339,7 @@ msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%
 #: apt-pkg/contrib/configuration.cc:872
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr ""
+msgstr "ไวยากรณ์ผิดพลาด %s:%u: directive 'clear' ต้องมีอาร์กิวเมนต์เป็นลำดับชั้นตัวเลือก"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2300,7 +2414,7 @@ msgstr "ไม่สามารถ stat ซีดีรอม"
 #: apt-pkg/contrib/fileutl.cc:93
 #, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "เกิดปัญหาขณะปิดแฟ้ม gzip %s"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2325,23 +2439,23 @@ msgstr "ไม่สามารถล็อค %s"
 #: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "ไม่สามารถสร้างรายชื่อแฟ้มได้ เนื่องจาก '%s' ไม่ใช่ไดเรกทอรี"
 
 #: apt-pkg/contrib/fileutl.cc:426
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่ใช่แฟ้มธรรมดา"
 
 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากไม่มีส่วนขยายในชื่อแฟ้ม"
 
 #: apt-pkg/contrib/fileutl.cc:453
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgstr "จะละเลย '%s' ในไดเรกทอรี '%s' เนื่องจากส่วนขยายในชื่อแฟ้มไม่สามารถใช้การได้"
 
 #: apt-pkg/contrib/fileutl.cc:840
 #, c-format
@@ -2351,7 +2465,7 @@ msgstr "โพรเซสย่อย %s เกิดข้อผิดพล�
 #: apt-pkg/contrib/fileutl.cc:842
 #, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "โพรเซสย่อย %s ได้รับสัญญาณ %u"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2361,7 +2475,7 @@ msgstr "โพรเซสย่อย %s คืนค่าข้อผิด�
 #: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน"
+msgstr "โพรเซสย่อย %s จบการทำงานกะทันหัน"
 
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
 #, c-format
@@ -2371,7 +2485,7 @@ msgstr "ไม่สามารถเปิดแฟ้ม %s"
 #: apt-pkg/contrib/fileutl.cc:1066
 #, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "ไม่สามารถเปิด file destriptor %d"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2379,32 +2493,32 @@ msgstr "สร้าง IPC ของโพรเซสย่อยไม่ส�
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ "
+msgstr "เรียกทำงานตัวบีบอัดไม่สำเร็จ"
 
 #: apt-pkg/contrib/fileutl.cc:1309
 #, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "read: ยังเหลือ %llu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
 #, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "write: ยังเหลือ %llu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "เกิดปัญหาขณะปิดแฟ้ม %s"
 
 #: apt-pkg/contrib/fileutl.cc:1748
 #, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "เกิดปัญหาขณะเปลี่ยนชื่อแฟ้ม %s ไปเป็น %s"
 
 #: apt-pkg/contrib/fileutl.cc:1759
 #, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "เกิดปัญหาขณะลบแฟ้ม %s"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2424,7 +2538,7 @@ msgstr "แฟ้มแคชของแพกเกจเป็นคนละ
 
 #: apt-pkg/pkgcache.cc:162
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "แฟ้มแคชของแพกเกจเสียหาย แฟ้มมีขนาดเล็กกว่าที่ควรจะเป็น"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2469,7 +2583,7 @@ msgstr "ทำให้พัง"
 
 #: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
-msgstr ""
+msgstr "เพิ่มความสามารถ"
 
 #: apt-pkg/pkgcache.cc:318
 msgid "important"
@@ -2530,27 +2644,27 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2
 #: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] แจงไม่ผ่าน)"
 
 #: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([ตัวเลือก] สั้นเกินไป)"
 
 #: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่ใช่การกำหนดค่า)"
 
 #: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] ไม่มีคีย์)"
 
 #: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ ([%s] คีย์ %s ไม่มีค่า)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2603,11 +2717,13 @@ msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
+"ไม่สามารถตั้งค่า '%s' แบบทันทีได้ กรุณาอ่านรายละเอียดเพิ่มเติมจาก man 5 apt.conf ที่หัวข้อ "
+"APT::Immediate-Configure (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "ไม่สามารถตั้งค่า '%s'"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2648,22 +2764,22 @@ msgstr "ไม่สามารถแก้ปัญหาได้ คุณ�
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
-msgstr ""
+msgstr "ดาวน์โหลดแฟ้มดัชนีบางแฟ้มไม่สำเร็จ จะข้ามรายการดังกล่าวไป หรือใช้ข้อมูลเก่าแทน"
 
 #: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "ไม่มีไดเรกทอรีรายชื่อแพกเกจ %spartial"
 
 #: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "ไม่มีไดเรกทอรีแพกเกจ %spartial"
 
 #: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "ไม่สามารถล็อคไดเรกทอรี %s"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2727,12 +2843,12 @@ msgstr "ไม่สามารถอ่านรายชื่อแหล่
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
-msgstr ""
+msgstr "ค่า '%s' ไม่สามารถใช้กับ APT::Default-Release ได้ เนื่องจากรุ่นดังกล่าวไม่มีในแหล่ง"
 
 #: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง %s: ไม่มีข้อมูลส่วนหัว 'Package'"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2759,7 +2875,7 @@ msgstr "แคชมีระบบนับรุ่นที่ไม่ตร
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (%s%d)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2820,11 +2936,13 @@ msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
+"ไม่พบรายการ '%s' ที่ต้องการในแฟ้ม Release (รายการ sources.list ไม่ถูกต้อง "
+"หรือแฟ้มผิดรูปแบบ)"
 
 #: apt-pkg/acquire-item.cc:1397
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "ไม่พบผลรวมแฮชสำหรับ '%s' ในแฟ้ม Release"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2836,11 +2954,13 @@ msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
+"แฟ้ม Release สำหรับ %s หมดอายุแล้ว (ตั้งแต่ %s ที่แล้ว) จะไม่ใช้รายการปรับรุ่นต่างๆ "
+"ของคลังแพกเกจนี้"
 
 #: apt-pkg/acquire-item.cc:1499
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
 
 #: apt-pkg/acquire-item.cc:1532
 #, c-format
@@ -2848,12 +2968,14 @@ msgid ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
+"เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า "
+"ข้อผิดพลาดจาก GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 #: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "ข้อผิดพลาดจาก GPG: %s: %s"
 
 #: apt-pkg/acquire-item.cc:1646
 #, c-format
@@ -2882,27 +3004,27 @@ msgstr "ขนาดไม่ตรงกัน"
 #: apt-pkg/indexrecords.cc:64
 #, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "ไม่สามารถแจงแฟ้ม Release %s"
 
 #: apt-pkg/indexrecords.cc:74
 #, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "ไม่มีหัวข้อย่อยในแฟ้ม Release %s"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "ไม่มีรายการแฮชในแฟ้ม Release %s"
 
 #: apt-pkg/indexrecords.cc:121
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "รายการ 'Valid-Until' ไม่ถูกต้องในแฟ้ม Release %s"
 
 #: apt-pkg/indexrecords.cc:140
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "รายการ 'Date' ไม่ถูกต้องในแฟ้ม Release %s"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2965,7 +3087,7 @@ msgstr ""
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
-msgstr ""
+msgstr "ไม่พบแฟ้มแพกเกจใดๆ บางทีแผ่นนี้อาจจะไม่ใช่แผ่นเดเบียน หรือสถาปัตยกรรมอาจไม่ถูกต้อง"
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
@@ -3020,23 +3142,23 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ�
 #: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "ไม่พบระเบียนยืนยันความแท้สำหรับ: %s"
 
 #: apt-pkg/indexcopy.cc:521
 #, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "แฮชไม่ตรงกันสำหรับ: %s"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
 msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
+msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
 #, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "ไม่มีพวงกุญแจติดตั้งไว้ใน %s"
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3051,17 +3173,17 @@ msgstr "ไม่พบรุ่น '%s' ของ '%s'"
 #: apt-pkg/cacheset.cc:517
 #, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "ไม่พบงานติดตั้ง '%s'"
 
 #: apt-pkg/cacheset.cc:523
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "ไม่พบแพกเกจที่ตรงกับนิพจน์เรกิวลาร์ '%s'"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "ไม่สามารถเลือกรุ่นต่างๆ ของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3069,41 +3191,42 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
+"ไม่สามารถเลือกรุ่นที่ติดตั้งไว้หรือรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีทั้งสองอย่าง"
 
 #: apt-pkg/cacheset.cc:555
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "ไม่สามารถเลือกรุ่นใหม่ที่สุดของแพกเกจ '%s' ได้ เนื่องจากเป็นแพกเกจเสมือนอย่างแท้จริง"
 
 #: apt-pkg/cacheset.cc:563
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgstr "ไม่สามารถเลือกรุ่นสำหรับติดตั้งของแพกเกจ '%s' ได้ เนื่องจากไม่มีรุ่นสำหรับติดตั้ง"
 
 #: apt-pkg/cacheset.cc:571
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgstr "ไม่สามารถเลือกรุ่นที่ติดตั้งไว้ของแพกเกจ '%s' ได้ เนื่องจากแพกเกจไม่ได้ติดตั้งไว้"
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr ""
+msgstr "ส่งสภาวการณ์ไปยังกลไกการแก้ปัญหา"
 
 #: apt-pkg/edsp.cc:209
 msgid "Send request to solver"
-msgstr ""
+msgstr "ส่งคำสั่งไปยังกลไกการแก้ปัญหา"
 
 #: apt-pkg/edsp.cc:277
 msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "เตรียมรับคำตอบ"
 
 #: apt-pkg/edsp.cc:284
 msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "กลไกการแก้ปัญหาภายนอกทำงานล้มเหลวโดยไม่มีข้อความข้อผิดพลาดที่เหมาะสม"
 
 #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
 msgid "Execute external solver"
-msgstr ""
+msgstr "เรียกกลไกการแก้ปัญหาภายนอก"
 
 #: apt-pkg/deb/dpkgpm.cc:72
 #, c-format
@@ -3123,12 +3246,12 @@ msgstr "กำลังถอดถอน %s"
 #: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "กำลังถอดถอน %s อย่างสมบูรณ์"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "กำลังจดบันทึกการหายไปของ %s"
 
 #: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
@@ -3144,7 +3267,7 @@ msgstr "ไม่มีไดเรกทอรี '%s'"
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
 #, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "ไม่สามารถเปิดแฟ้ม '%s'"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3194,38 +3317,39 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:1238
 msgid "Running dpkg"
-msgstr ""
+msgstr "กำลังเรียก dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1410
 msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "ปฏิบัติการถูกขัดจังหวะก่อนที่จะสามารถทำงานเสร็จ"
 
 #: apt-pkg/deb/dpkgpm.cc:1472
 msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "ไม่มีการเขียนรายงาน apport เพราะถึงขีดจำกัด MaxReports แล้ว"
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1477
 msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "มีปัญหาความขึ้นต่อกัน - จะทิ้งไว้โดยไม่ตั้งค่า"
 
 #: apt-pkg/deb/dpkgpm.cc:1479
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
+"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเป็นสิ่งที่ตามมาจากข้อผิดพลาดก่อนหน้า"
 
 #: apt-pkg/deb/dpkgpm.cc:1485
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
-msgstr ""
+msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากดิสก์เต็ม"
 
 #: apt-pkg/deb/dpkgpm.cc:1492
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
-msgstr ""
+msgstr "ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากหน่วยความจำเต็ม"
 
 #: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
 msgid ""
@@ -3237,18 +3361,19 @@ msgstr ""
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
+"ไม่มีการเขียนรายงาน apport เพราะข้อความข้อผิดพลาดระบุว่าเกิดจากปัญหาการอ่าน/เขียนของ dpkg"
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
-msgstr ""
+msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) มีโพรเซสอื่นใช้งานอยู่หรือเปล่า?"
 
 #: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "ไม่สามารถล็อคไดเรกทอรีดูแลระบบ (%s) คุณเป็น root หรือเปล่า?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3256,88 +3381,175 @@ msgstr ""
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgstr "dpkg ถูกขัดจังหวะ คุณต้องเรียก '%s' เองเพื่อแก้ปัญหา"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
-msgstr ""
+msgstr "ไม่ได้ล็อคอยู่"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
+#~ msgid "Failed to remove %s"
+#~ msgstr "ไม่สามารถลบ %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "ไม่สามารถสร้าง %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "ไม่สามารถ stat %sinfo"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "ไม่พบแฟ้มควบคุมที่ใช้การได้"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "ไม่สามารถเปลี่ยนไปยังไดเรกทอรีระบบ %sinfo"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "เกิดข้อผิดพลาดขณะแจง MD5 ที่ออฟเซ็ต %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "เกิดข้อผิดพลาดภายในขณะอ่านชื่อแพกเกจ"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "หมวด ConfFile เสียหายในแฟ้ม status ที่ออฟเซ็ต %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "กำลังอ่านรายชื่อแฟ้ม"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "หาข้อมูลส่วนหัว Package: ไม่พบ ที่ออฟเซ็ต %lu"
+#~ 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' ไม่สำเร็จ ถ้าคุณไม่สามารถเรียกแฟ้มนี้คืนได้ "
+#~ "ก็ให้สร้างแฟ้มดังกล่าวให้เป็นแฟ้มเปล่า แล้วติดตั้งแพกเกจรุ่นเดิมซ้ำทันที"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "ต้องกำหนดค่าตั้งต้นแคชของแพกเกจก่อน"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "อ่านแฟ้มรายชื่อแฟ้ม %sinfo/%s ไม่สำเร็จ"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่ม diversion"
+#~ msgid "Internal error getting a node"
+#~ msgstr "เกิดข้อผิดพลาดภายในขณะอ่านโหนด"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "เปิดแฟ้ม diversion %sdiversions ไม่สำเร็จ"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "แฟ้ม diversion เสียหาย"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "เปิดแฟ้ม diversion %sdiversions ไม่สำเร็จ"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "ข้อมูลผิดพลาดในแฟ้ม diversion: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "เกิดข้อผิดพลาดภายในขณะอ่านโหนด"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "เกิดข้อผิดพลาดภายในขณะเพิ่ม diversion"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "อ่านแฟ้มรายชื่อแฟ้ม %sinfo/%s ไม่สำเร็จ"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "ต้องกำหนดค่าตั้งต้นแคชของแพกเกจก่อน"
 
-#~ 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' ไม่สำเร็จ ถ้าคุณไม่สามารถเรียกแฟ้มนี้คืนได้ "
-#~ "ก็ให้สร้างแฟ้มดังกล่าวให้เป็นแฟ้มเปล่า แล้วติดตั้งแพกเกจรุ่นเดิมซ้ำทันที"
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "หาข้อมูลส่วนหัว Package: ไม่พบ ที่ออฟเซ็ต %lu"
 
-#~ msgid "Reading file listing"
-#~ msgstr "กำลังอ่านรายชื่อแฟ้ม"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "หมวด ConfFile เสียหายในแฟ้ม status ที่ออฟเซ็ต %lu"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "เกิดข้อผิดพลาดภายในขณะอ่านชื่อแพกเกจ"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "เกิดข้อผิดพลาดขณะแจง MD5 ที่ออฟเซ็ต %lu"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "ไม่สามารถเปลี่ยนไปยังไดเรกทอรีระบบ %sinfo"
+#~ msgid "Couldn't change to %s"
+#~ msgstr "ไม่สามารถเปลี่ยนไดเรกทอรีไปยัง %s"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "ไม่พบแฟ้มควบคุมที่ใช้การได้"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "ไม่สามารถ stat %sinfo"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "ไม่สามารถเปิดไปป์สำหรับ %s"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "ไม่สามารถสร้าง %s"
+#~ msgid "Read error from %s process"
+#~ msgstr "เกิดข้อผิดพลาดขณะอ่านจากโพรเซส %s"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "ไม่สามารถลบ %s"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "ได้รับบรรทัดข้อมูลส่วนหัวยาวเกิน %u อักขระ"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "แฟ้ม override %s ผิดรูปแบบที่บรรทัด %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "ตัวคลายบีบอัด"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewFileDesc2)"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้"
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "ข้อผิดพลาดภายใน: ไม่พบสมาชิก"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "เกิดข้อผิดพลาดขณะประมวลผล %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "ไม่สามารถแพตช์แฟ้ม"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "กำลังประมวลผลการสะกิดสำหรับ %s"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "เนื้อที่สำหรับทำ MMap แบบพลวัตเต็มแล้ว"
+
+#~ 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"
+#~ "คุณควรจะรายงานบั๊กสำหรับแพกเกจนี้"
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "บรรทัด %d ยาวเกินไป (สูงสุด %lu)"
+
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "บรรทัด %d ยาวเกินไป (สูงสุด %d)"
+
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "พบดัชนีแพกเกจ %i รายการ, ดัชนีซอร์ส %i รายการ, ดัชนีคำแปล %i รายการ และลายเซ็น %i "
+#~ "รายการ\n"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "แพกเกจ %s ไม่ได้ติดตั้งไว้ จึงไม่มีการถอดถอน\n"
+#~ msgid "openpty failed\n"
+#~ msgstr "openpty ล้มเหลว\n"
diff --git a/po/tl.po b/po/tl.po
index b2a48ef06..af5416cc3 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -11,16 +11,14 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:17+0000\n"
-"Last-Translator: Eric Pareja <eric.pareja@gmail.com>\n"
+"PO-Revision-Date: 2007-03-29 21:36+0800\n"
+"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
 "Language: tl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -32,8 +30,9 @@ msgid "Total package names: "
 msgstr "Kabuuan ng mga Pakete : "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Kabuuan ng mga Pakete : "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
@@ -60,8 +59,9 @@ msgid "Total distinct versions: "
 msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Kabuuan ng Natatanging mga Bersyon: "
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
@@ -72,8 +72,9 @@ msgid "Total ver/file relations: "
 msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "Kabuuan ng ugnayang Ber/Talaksan: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
@@ -107,8 +108,9 @@ msgid "No packages found"
 msgstr "Walang nahanap na mga pakete"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "Kailangan niyong magbigay ng isa lamang na pattern"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -161,11 +163,12 @@ msgstr "  Talaang Bersyon:"
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s para sa %s %s kinompile noong %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -201,19 +204,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 ""
+"Pag-gamit: apt-cache [mga option] utos\n"
+"       apt-cache [mga option] add talaksan1 [talaksan2 ...]\n"
+"       apt-cache [mga option] showpkg pkt1 [pkt2 ...]\n"
+"       apt-cache [mga option] showsrc pkt1 [pkt2 ...]\n"
+"\n"
+"apt-cache ay isang kagamitang low-level para sa pag-manipula\n"
+"ng mga talaksan sa binary cache ng APT, at upang makakuha ng\n"
+"impormasyon mula sa kanila\n"
+"\n"
+"Mga utos:\n"
+"   add - Magdagdag ng talaksang pakete sa source cache\n"
+"   gencaches - Buuin pareho ang cache ng pakete at source\n"
+"   showpkg - Ipakita ang impormasyon tungkol sa isang pakete\n"
+"   showsrc - Ipakita ang mga record ng source\n"
+"   stats - Ipakita ang ilang mga estadistika\n"
+"   dump - Ipakita ang buong talaksan sa anyong maikli\n"
+"   dumpavail - Ipakita ang talaksang available sa stdout\n"
+"   unmet - Ipakita ang mga kulang na mga dependensiya\n"
+"   search - Maghanap sa listahan ng mga pakete ng regex pattern\n"
+"   show - Ipakita ang nababasang record ng pakete\n"
+"   depends - Ipakita ang impormasyon tungkol sa ganap na dependensiya\n"
+"             ng pakete\n"
+"   rdepends - Ipakita ang impormasyong kabaliktarang dependensiya ng pakete\n"
+"   pkgnames - Ipakita ang listahan ng pangalan ng lahat ng mga pakete\n"
+"   dotty - Bumuo ng graph ng mga pakete para sa GraphViz\n"
+"   xvcg - Bumuo ng graph ng mga pakete para sa xvcg\n"
+"   policy - Ipakita ang pagkaayos ng mga policy\n"
+"\n"
+"Mga option:\n"
+"  -h   Itong tulong na ito.\n"
+"  -p=? Ang cache ng mga pakete.\n"
+"  -s=? Ang cache ng mga source.\n"
+"  -q   Huwag ipakita ang hudyat ng progreso.\n"
+"  -i   Ipakita lamang ang importanteng mga dep para sa utos na unmet\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Magtakda ng isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+"Basahin ang pahina ng manwal ng apt-cache(8) at apt.conf(5) para sa \n"
+"karagdagang impormasyon\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
+msgstr "Bigyan ng pangalan ang Disk na ito, tulad ng 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Paki-pasok ang isang Disk sa drive at pindutin ang enter"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -361,14 +403,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu na hindi lubos na nailuklok o tinanggal.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Paunawa, pinili ang %s para sa regex '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -380,8 +422,9 @@ msgid " [Installed]"
 msgstr " [Nakaluklok]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Bersyong Kandidato"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -403,9 +446,9 @@ msgid "However the following packages replace it:"
 msgstr "Gayunpaman, ang sumusunod na mga pakete ay humahalili sa kanya:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -414,19 +457,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -435,9 +478,10 @@ msgstr ""
 "Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -450,19 +494,19 @@ msgid "%s is already the newest version.\n"
 msgstr "%s ay pinakabagong bersyon na.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "ngunit ang %s ay iluluklok"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Ang napiling bersyon %s (%s) para sa %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -551,16 +595,17 @@ msgstr "Kailangang kumuha ng %sB ng arkibo.\n"
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
+"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
@@ -653,9 +698,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -693,25 +738,27 @@ msgstr ""
 "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "Error na internal, may nasira ang problem resolver"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
+msgstr[1] "Ang sumusunod na mga paketeng BAGO ay iluluklok:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -769,9 +816,9 @@ msgid "Couldn't find package %s"
 msgstr "Hindi mahanap ang paketeng %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "ngunit ang %s ay iluluklok"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -912,11 +959,13 @@ msgid "%s has no build depends.\n"
 msgstr "Walang build depends ang %s.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
+"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
+"mahanap"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -935,18 +984,22 @@ msgstr ""
 "%s ay bagong-bago pa lamang."
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi "
+"mahanap"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -963,15 +1016,16 @@ msgid "Failed to process build dependencies"
 msgstr "Bigo sa pagproseso ng build dependencies"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Kumokonekta sa %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Suportadong mga Module:"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1016,6 +1070,44 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Pag-gamit: apt-get [mga option] utos\n"
+"           apt-get [mga option] install|remove pkt1 [pkt2 ...]\n"
+"           apt-get [mga option] source pkt1 [pkt2 ...]\n"
+"\n"
+"Ang apt-get ay payak na command line interface para sa pagkuha at\n"
+"pag-instol ng mga pakete. Ang pinakamadalas na gamiting utos ay update\n"
+"at install.\n"
+"\n"
+"Mga utos:\n"
+"   update - Kunin ang bagong listahan ng mga pakete\n"
+"   upgrade - Gumawa ng upgrade\n"
+"   install - Mag-instol ng bagong mga pakete (pkt ay libc6 hindi libc6.deb)\n"
+"   remove - Mag-tanggal ng mga pakete\n"
+"   source - Kumuha ng arkibong source\n"
+"   build-dep - Magsaayos ng build-dependencies para sa mga paketeng source\n"
+"   dist-upgrade - Mag-upgrade ng pamudmod, basahin ang apt-get(8)\n"
+"   dselect-upgrade - Sundan ang mga pinili sa dselect\n"
+"   clean - Burahin ang mga nakuhang mga talaksang naka-arkibo\n"
+"   autoclean - Burahin ang mga lumang naka-arkibo na nakuhang mga talaksan\n"
+"   check - Tiyakin na walang mga sirang dependensiya\n"
+"\n"
+"Mga option:\n"
+"  -h  Itong tulong na ito.\n"
+"  -q  Output na maaaring itala - walang indikator ng progreso\n"
+"  -qq Walang output maliban sa mga error\n"
+"  -d  Kunin lamang - HINDI mag-instol o mag-buklat ng mga arkibo\n"
+"  -s  Walang gagawin. Mag-simulate lamang ang pagkasunod-sunod.\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Subukang magpatuloy kung bigo ang pagsuri ng integridad\n"
+"  -m  Subukang magpatuloy kung hindi mahanap ang mga arkibo\n"
+"  -u  Ipakita rin ang listahan ng mga paketeng i-upgrade\n"
+"  -b  Ibuo ang paketeng source matapos kunin ito\n"
+"  -V  Ipakita ng buo ang bilang ng bersyon\n"
+"  -c=? Basahin itong talaksang pagkaayos\n"
+"  -o=? Itakda ang isang option ng pagkaayos, hal. -o dir::cache=/tmp\n"
+"Basahin ang pahinang manwal ng apt-get(8), sources.list(5) at apt.conf(5)\n"
+"para sa karagdagang impormasyon at mga option.\n"
+"                       Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1031,7 +1123,7 @@ msgstr "Tumama "
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
-msgstr "Kunin:"
+msgstr "Kunin: "
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
@@ -1063,29 +1155,29 @@ msgstr ""
 "sa drive '%s' at pindutin ang enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "ngunit ito ay hindi nakaluklok"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "ngunit ang %s ay iluluklok"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "ngunit ang %s ay iluluklok"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s ay pinakabagong bersyon na.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s ay pinakabagong bersyon na.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1094,14 +1186,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Naghintay, para sa %s ngunit wala nito doon"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "ngunit ang %s ay iluluklok"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Bigo ang pagbukas ng %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1370,14 +1462,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Hindi maka-konekta sa %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1391,8 +1483,10 @@ msgid "At least one invalid signature was encountered."
 msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro."
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
+"Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1511,9 +1605,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Hindi mabuksan ang talaksang %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1556,12 +1650,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1746,10 +1842,13 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "Luma ang DB, sinusubukang maupgrade ang %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
+"Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang "
+"bersiyon ng apt, tanggalin at likhain muli ang database."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1865,19 +1964,19 @@ msgid "Unable to open %s"
 msgstr "Hindi mabuksan %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Maling anyo ng override %s linya %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Maling anyo ng override %s linya %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Maling anyo ng override %s linya %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1930,6 +2029,7 @@ msgid "Failed to rename %s to %s"
 msgstr "Bigo ang pagpangalan muli ng %s tungong %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1942,6 +2042,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Pag-gamit: apt-extracttemplates talaksan1 [talaksan2 ...]\n"
+"\n"
+"Ang apt-extracttemplates ay kagamitan sa pagkuha ng info tungkol\n"
+"sa pagkaayos at template mula sa mga paketeng debian\n"
+"\n"
+"Mga opsyon:\n"
+"  -h   Itong tulong na ito\n"
+"  -t   Itakda ang dir na pansamantala\n"
+"  -c=? Basahin ang talaksang pagkaayos na ito\n"
+"  -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2002,9 +2112,9 @@ msgid "Error reading archive member header"
 msgstr "Error sa pagbasa ng header ng miyembro ng arkibo"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Hindi tanggap na header ng miyembro ng arkibo"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -2118,9 +2228,10 @@ msgstr "Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s'"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
+"Hindi ito tanggap na arkibong DEB, may kulang na miyembrong '%s' o '%s'"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2136,22 +2247,24 @@ msgid "Can't mmap an empty file"
 msgstr "Hindi mai-mmap ang talaksang walang laman"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Hindi makagawa ng mmap ng %lu na byte"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Hindi mabuksan %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Hindi ma-invoke "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2159,8 +2272,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Hindi makagawa ng mmap ng %lu na byte"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2257,9 +2371,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
+"Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2334,9 +2449,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Bigo sa pag-stat ng cdrom"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Problema sa pagsara ng talaksan"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2388,9 +2503,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Nakatanggap ang sub-process %s ng segmentation fault."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2408,9 +2523,9 @@ msgid "Could not open file %s"
 msgstr "Hindi mabuksan ang talaksang %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Hindi makapag-bukas ng pipe para sa %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2418,32 +2533,32 @@ msgstr "Bigo ang paglikha ng subprocess IPC"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "Bigo ang pag-exec ng taga-compress "
+msgstr "Bigo ang pag-exec ng taga-compress"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Problema sa pagsara ng talaksan"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Problema sa pag-sync ng talaksan"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Problema sa pag-unlink ng talaksan"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2462,8 +2577,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Ang talaksan ng cache ng pakete ay hindi magamit na bersyon"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Sira ang talaksan ng cache ng pakete"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2543,18 +2659,19 @@ msgid "Dependency generation"
 msgstr "Pagbuo ng Dependensiya"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "Pinagsasama ang magagamit na impormasyon"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "Bigo ang pagbukas ng %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "Bigo sa pagsulat ng talaksang %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2567,29 +2684,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Hindi ma-parse ang talaksang pakete %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2644,9 +2761,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Hindi mabuksan ang talaksang %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2687,25 +2804,28 @@ msgstr ""
 "Hindi maayos ang mga problema, mayroon kayong sirang mga pakete na naka-hold."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"May mga talaksang index na hindi nakuha, sila'y di pinansin, o ginamit ang "
+"mga luma na lamang."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Nawawala ang directory ng talaan %spartial."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Nawawala ang directory ng arkibo %spartial."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Hindi maaldaba ang directory ng talaan"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2742,7 +2862,7 @@ msgstr "Hindi suportado ang sistema ng paketeng '%s'"
 
 #: apt-pkg/init.cc:168
 msgid "Unable to determine a suitable packaging system type"
-msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete"
+msgstr "Hindi matuklasan ang akmang uri ng sistema ng pakete "
 
 #: apt-pkg/clean.cc:57
 #, c-format
@@ -2776,9 +2896,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2803,9 +2923,9 @@ msgstr "Hindi akma ang versioning system ng cache"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2817,8 +2937,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "Wow, nalagpasan niyo ang bilang ng bersyon na kaya ng APT na ito."
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2859,8 +2980,9 @@ msgstr "Di tugmang MD5Sum"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "Di tugmang MD5Sum"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2870,9 +2992,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2934,14 +3056,14 @@ msgid "Size mismatch"
 msgstr "Di tugmang laki"
 
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Paunawa, pinili ang %s imbes na %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2949,14 +3071,14 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Di tanggap na linya sa talaksang diversion: %s"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Hindi ma-parse ang talaksang pakete %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2974,16 +3096,17 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "Kinikilala... "
+msgstr "Kinikilala..."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
 msgid "Stored label: %s\n"
-msgstr "Naka-imbak na Label: %s\n"
+msgstr "Naka-imbak na Label: %s \n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "Ina-unmount ang CD-ROM..."
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -3007,11 +3130,13 @@ msgid "Scanning disc for index files..\n"
 msgstr "Sinisiyasat ang Disc para sa talaksang index...\n"
 
 #: apt-pkg/cdrom.cc:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
+"Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
+"signature\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
@@ -3020,9 +3145,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:782
-#, c-format
+#, fuzzy, c-format
 msgid "Found label '%s'\n"
-msgstr ""
+msgstr "Naka-imbak na Label: %s \n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3077,9 +3202,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Di tugmang MD5Sum"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3088,9 +3213,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Ina-abort ang pag-instol."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3103,14 +3228,14 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Hindi mahanap ang paketeng %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Hindi mahanap ang paketeng %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3160,9 +3285,9 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "Iniluklok ang %s"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
@@ -3175,9 +3300,9 @@ msgid "Removing %s"
 msgstr "Tinatanggal ang %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "Natanggal ng lubusan ang %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3191,14 +3316,14 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "Nawawala ang directory ng talaan %spartial."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Hindi mabuksan ang talaksang %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3298,9 +3423,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Hindi maaldaba ang directory ng talaan"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3314,80 +3439,223 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Binubuksan ang talaksang pagsasaayos %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Error sa pagbasa mula sa prosesong %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Bigo sa pagtanggal ng %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Hindi makapag-bukas ng pipe para sa %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Hindi malikha ang %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Bigo sa paghanap ng tanggap na talaksang control"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Bigo sa pag-stat ng %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Hindi makalipat sa %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Error sa pag-parse ng MD5. Offset %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Bigo sa paglipat sa admin dir %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Maling ConfFile section sa talaksang status. Offset %lu"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Internal error sa pagkuha ng pangalan ng pakete"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu"
+#~ msgid "Reading file listing"
+#~ msgstr "Binabasa ang Talaksang Listahan"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Ang cache ng pkg ay dapat ma-initialize muna"
+#~ 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 ""
+#~ "Bigo sa pagbukas ng talaksang listahan '%sinfo/%s'. Kung hindi niyo "
+#~ "maibalik ang talaksang ito, gawin itong walang laman at muling instolahin "
+#~ "kaagad ang parehong bersyon ng pakete!"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Internal error sa pagdagdag ng diversion"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Di tanggap na linya sa talaksang diversion: %s"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Internal error sa pagkuha ng Node"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "Ang talaksang diversion ay sira"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Bigo sa pagbukas ng talaksang diversions %sdiversions"
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Di tanggap na linya sa talaksang diversion: %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Internal error sa pagkuha ng Node"
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Internal error sa pagdagdag ng diversion"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Bigo sa pagbasa ng talaksang listahan %sinfo/%s"
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Ang cache ng pkg ay dapat ma-initialize muna"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Bigo sa paghanap ng Pakete: Header, offset %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Maling ConfFile section sa talaksang status. Offset %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Error sa pag-parse ng MD5. Offset %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Hindi makalipat sa %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Bigo sa paghanap ng tanggap na talaksang control"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Hindi makapag-bukas ng pipe para sa %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Error sa pagbasa mula sa prosesong %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Maling anyo ng override %s linya %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Maling anyo ng override %s linya %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Maling anyo ng override %s linya %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "taga-decompress"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewPackage)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewVersion1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "May naganap na Error habang prinoseso ang %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Internal error, hindi mahanap ang miyembro"
+
+#~ 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."
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Hindi mabasa ang keyring: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Hindi mai-patch ang talaksan"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Error sa pagproseso ng directory %s"
 
 #~ 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!"
+#~ "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 ""
-#~ "Bigo sa pagbukas ng talaksang listahan '%sinfo/%s'. Kung hindi niyo "
-#~ "maibalik ang talaksang ito, gawin itong walang laman at muling instolahin "
-#~ "kaagad ang parehong bersyon ng pakete!"
+#~ "Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete "
+#~ "ay\n"
+#~ "hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n"
+#~ "pakete na ito."
 
-#~ msgid "Reading file listing"
-#~ msgstr "Binabasa ang Talaksang Listahan"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Labis ang haba ng linyang %d (max %d)"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Internal error sa pagkuha ng pangalan ng pakete"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Labis ang haba ng linyang %d (max %d)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Bigo sa paglipat sa admin dir %sinfo"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "May naganap na error habang prinoseso ang %s (NewFileVer1)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Bigo sa pag-stat ng %sinfo"
+#, fuzzy
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Naka-imbak na Label: %s \n"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Hindi malikha ang %s"
+#, fuzzy
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "Nakahanap ng %i na index ng mga pakete, %i na index ng source at %i na "
+#~ "signature\n"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Bigo sa pagtanggal ng %s"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Bigo ang pagpili"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Nagbago ang petsa ng talaksang %s"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n"
+#~ 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/uk.po b/po/uk.po
index e0353fde8..3a3105de1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,56 +1,61 @@
 # translation of apt-all.po to Українська
 # This file is put in the public domain.
 #
-# Artem Bondarenko <artem.brz@gmail.com>, 2006.
+# A. Bondarenko <artem.brz@gmail.com>, 2006, 2012.
+# неможливо + не вдалося
+# parse на аналізувати
+# Release
+# вихідні тексти
+# y/n замість т/н
+# binary = двійковий
 msgid ""
 msgstr ""
 "Project-Id-Version: apt-all\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-10-02 12:12+0000\n"
-"Last-Translator: andygol <Unknown>\n"
+"PO-Revision-Date: 2012-09-25 20:19+0300\n"
+"Last-Translator: A. Bondarenko <artem.brz@gmail.com>\n"
 "Language-Team: Українська <uk@li.org>\n"
-"Language: \n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: KBabel 1.11.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Пакунок %s версії %s має незадоволені залежності:\n"
+msgstr "Пакунок %s версії %s має незадоволену залежність:\n"
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "Всього імен пакунків : "
+msgstr "Всього імен пакунків: "
 
 #: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
-msgstr "Повна структура пакунків: "
+msgstr "Всього структур пакунків: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  Звичайні пакунки: "
+msgstr "  Нормальних пакунків: "
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Чисто віртуальні пакунки: "
+msgstr "  Цілком віртуальних пакунків: "
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  Окремі віртуальні пакунки: "
+msgstr "  Окремих віртуальних пакунків: "
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  Змішані віртуальні пакунки: "
+msgstr "  Змішаних віртуальних пакунків: "
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  Пропущено: "
+msgstr "  Відсутні: "
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
@@ -70,27 +75,30 @@ msgstr "Всього відносин Версія/Файл: "
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
-msgstr "Всьго взаємозв’язків опис/файл: "
+msgstr "Всього відносин Опис/Файл: "
 
 #: cmdline/apt-cache.cc:345
+#, fuzzy
 msgid "Total Provides mappings: "
-msgstr "Всього відносин Provides: "
+msgstr "Всього карт 'Provides': "
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "Всього розгорнутих рядків: "
+msgstr "Всього відфільтрованих (globbed) рядків: "
 
 #: cmdline/apt-cache.cc:371
+#, fuzzy
 msgid "Total dependency version space: "
 msgstr "Всього інформації про залежності: "
 
 #: cmdline/apt-cache.cc:376
+#, fuzzy
 msgid "Total slack space: "
 msgstr "Порожнього місця в кеші: "
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "Загальний простір виділений для: "
+msgstr "Загальний простір полічений для: "
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -105,16 +113,16 @@ msgstr "Не знайдено жодного пакунка"
 
 #: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
-msgstr "Ви маєте задати принаймні один шаблон пошуку"
+msgstr "Ви повинні задати не менше одного шаблону пошуку"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "Ця команда застаріла. Будь ласка, використовуйте 'apt-mark showauto'."
+msgstr "Ця команда є застарілою. Будь-ласка використовуйте 'apt-mark showauto'"
 
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "Неможливо знайти пакунок %s"
+msgstr "Не можу знайти пакунок %s"
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
@@ -147,7 +155,7 @@ msgstr "(відсутній)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  Фіксатор (pin) пакунка: "
+msgstr "  Фіксатор(pin) пакунка: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -160,7 +168,7 @@ msgstr "  Таблиця версій:"
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s для %s скомпільовано у %s %s\n"
+msgstr "%s %s для %s скомпільовано %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
 msgid ""
@@ -198,63 +206,60 @@ 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 [параметри] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [параметри] showsrc pkg1 [pkg2 ...]\n"
+"Використання: apt-cache [опції] команда\n"
+"              apt-cache [опції] showpkg пакунок1 [пкн2 ...]\n"
+"              apt-cache [опції] showsrc пакунок1 [пкн2 ...]\n"
 "\n"
-"apt-cache є інструментом низького рівня, який використовується\n"
-"для отримання інформації з бінарного файлу APT кешу\n"
+"apt-cache - низькорівневий інструмент, що використовується для запиту\n"
+"інформації з двійкових кеш-файлів APT\n"
 "\n"
 "Команди:\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 - Згенерувати графік пакунків для GraphViz\n"
-"   xvcg - Згенерувати графік пакунків для xvcg\n"
-"   policy - Показати налаштування політики\n"
+"   gencaches - побудувати обидва кеші - бінарний і з вихідними текстами\n"
+"   showpkg - показати загальну інформацію про конкретний пакунок\n"
+"   showsrc - показати інформацію про вихідний текст (source)\n"
+"   stats - показати основну статистику\n"
+"   dump - показати весь файл у стислій формі\n"
+"   dumpavail - видати доступний файл на stdout\n"
+"   unmet - показати незадоволені залежності\n"
+"   search - знайти пакунки, назва яких задовольняє регулярний вираз\n"
+"   show - показати інформацію про пакунок в зрозумілій формі\n"
+"   depends - показати інформацію про залежності пакунка\n"
+"   rdepends - показати інформацію про зворотні залежності пакунка\n"
+"   pkgnames - показати імена всіх пакунків у системі\n"
+"   dotty - генерувати графік пакунків у форматі GraphViz\n"
+"   xvcg - генерувати графік пакунків у форматі xvcg\n"
+"   policy - показати поточну політику\n"
 "\n"
-"Параметри:\n"
-"  -h - ця довідка.\n"
-"  -p=? - кеш пакунка.\n"
-"  -s=? - кеш джерела.\n"
-"  -q - вимкнути індикатор стану.\n"
-"  -i - показувати лише важливі відомості для команди unmet.\n"
-"  -c=? використовувати цей файл конфігурації\n"
-"  -o=? встановити довільні параметри налаштувань, напр. -o\n"
-"dir::cache=/tmp\n"
-"Дивіться apt-cache(8) і apt.conf(5) допомогу для детальнішої\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:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr ""
-"Будь-ласка, надайте ім’я для цього Диску, наприклад  'Debian 5.0.3 Disk 1'"
+msgstr "Задайте назву для цього Диска, наприклад 'Debian 5.0.3 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "Вставте диск у пристрій і натисніть «enter»"
+msgstr "Будь-ласка, вставте Диск у пристрій і натисніть Enter"
 
 #: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Не вдалося змонтувати '%s' до '%s'"
+msgstr "Не вдалося під'єднати '%s' до '%s'"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Повторіть операцію для всіх інших дисків."
+msgstr "Повторіть цей процес для решти CD з вашого набору."
 
 #: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
-msgstr "Непарні аргументи"
+msgstr "Аргументи не в парах"
 
 #: cmdline/apt-config.cc:87
 msgid ""
@@ -271,27 +276,26 @@ 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"
+"   shell - режим shell\n"
+"   dump - показати конфігурацію\n"
 "\n"
-"Параметри\n"
-"  -h Це повідомлення\n"
-"  -c=? Використовувати зазначений файл налаштувань\n"
-"  -o=? Встановити довільний параметр налаштувань (наприклад, dir::cache=/"
-"tmp)\n"
+"Опції:\n"
+"   -h   Цей текст допомоги.\n"
+"   -с=? Читати зазначений конфігураційний файл.\n"
+"   -o=? Встановити умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
 #: cmdline/apt-get.cc:135
 msgid "Y"
-msgstr "Т"
+msgstr "Y"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr "Н"
+msgstr "N"
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
@@ -305,16 +309,16 @@ msgstr "Пакунки, що мають незадоволені залежно�
 #: cmdline/apt-get.cc:350
 #, c-format
 msgid "but %s is installed"
-msgstr "але %s встановлено"
+msgstr "але %s вже встановлений"
 
 #: cmdline/apt-get.cc:352
 #, c-format
 msgid "but %s is to be installed"
-msgstr "але %s має бути встановлено"
+msgstr "але %s буде встановлений"
 
 #: cmdline/apt-get.cc:359
 msgid "but it is not installable"
-msgstr "проте його неможливо встановити"
+msgstr "але він не може бути встановлений"
 
 #: cmdline/apt-get.cc:361
 msgid "but it is a virtual package"
@@ -338,11 +342,11 @@ msgstr "НОВІ пакунки, які будуть встановлені:"
 
 #: cmdline/apt-get.cc:424
 msgid "The following packages will be REMOVED:"
-msgstr "Наступні пакунки будуть ВИЛУЧЕНІ:"
+msgstr "Пакунки, які будуть ВИДАЛЕНІ:"
 
 #: cmdline/apt-get.cc:446
 msgid "The following packages have been kept back:"
-msgstr "Пакунки, які будуть залишені в незмінному вигляді:"
+msgstr "Пакунки, які залишені в незмінному стані:"
 
 #: cmdline/apt-get.cc:467
 msgid "The following packages will be upgraded:"
@@ -350,11 +354,11 @@ msgstr "Пакунки, які будуть ОНОВЛЕНІ:"
 
 #: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
-msgstr "Пакунки, будуть замінені на більш СТАРІ версії:"
+msgstr "Пакунки, які будуть замінені на СТАРІШІ версії:"
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
-msgstr "Пакунки, які повинні були б залишитися без змін, але будуть замінені:"
+msgstr "Пакунки, які мали б залишитися без змін, але будуть замінені:"
 
 #: cmdline/apt-get.cc:563
 #, c-format
@@ -366,13 +370,13 @@ 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:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "оновлено %lu, встановлено %lu нових пакунків, "
+msgstr "оновлено %lu, встановлено %lu нових, "
 
 #: cmdline/apt-get.cc:606
 #, c-format
@@ -382,27 +386,27 @@ msgstr "%lu перевстановлено, "
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "%lu пакунків замінено на старі версії, "
+msgstr "%lu замінено на старіші версії, "
 
 #: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "для вилучення відмічено %lu пакунків, і %lu пакунків не оновлено.\n"
+msgstr "%lu відмічено для видалення і %lu не оновлено.\n"
 
 #: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
-msgstr "не встановлено до кінця чи вилучено %lu пакунків.\n"
+msgstr "не встановлено(видалено) до кінця %lu пакунків.\n"
 
 #: cmdline/apt-get.cc:635
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Увага, вибір '%s' для завдання '%s'\n"
+msgstr "Помітьте, вибирається '%s' для завдання '%s'\n"
 
 #: cmdline/apt-get.cc:640
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Увага, вибір '%s' для regex '%s'\n"
+msgstr "Помітьте, вибирається '%s' для регулярного виразу '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -415,11 +419,11 @@ msgstr " [Встановлено]"
 
 #: cmdline/apt-get.cc:677
 msgid " [Not candidate version]"
-msgstr " [Відсутння версія кандидат]"
+msgstr " [Версія не кандидат]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
-msgstr "Ви повинні явно вказати, який саме пакунок ви бажаєте встановити."
+msgstr "Ви повинні явно вказати, який саме ви хочете встановити."
 
 #: cmdline/apt-get.cc:682
 #, c-format
@@ -435,46 +439,47 @@ msgstr ""
 
 #: cmdline/apt-get.cc:700
 msgid "However the following packages replace it:"
-msgstr "Однак наступні пакунки можуть його замінити:"
+msgstr "Однак наступні пакунки заміняють його:"
 
 #: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Пакунок '%s' не має кандидатів на встановлення"
+msgstr "Для пакунка '%s' не знайдено кандидатів на встановлення"
 
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Віртуальні пакунки, такі як '%s' , не можуть бути вилученими\n"
+msgstr "Віртуальні пакунки як '%s' не можуть бути видаленими\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
 #, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
 msgstr ""
-"Пакунок '%s' не встановлений, тому не був вилучений. Можливо, ви мали на "
-"увазі '%s'?\n"
+"Пакунок '%s' не встановлений, тому не видалений. Можливо ви мали на увазі "
+"'%s'?\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
 #, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Пакунок '%s' не встановлений, тому не був вилучений\n"
+msgstr "Пакунок '%s' не встановлений, тому не видалений\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Увага, вибір '%s' замість '%s'\n"
+msgstr "Помітьте, вибирається '%s' замість '%s'\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
-"Пропускається %s - пакунок вже встановлений, і параметр upgrade не заданий.\n"
+"Пропускається %s, пакунок вже встановлений і опція ОНОВИТИ не встановлена.\n"
 
 #: cmdline/apt-get.cc:822
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Пропускаємо %s, він не встановлений, пропонується лише оновлення.\n"
+msgstr ""
+"Пропускається %s, пакунок не встановлений, а запитуються тільки оновлення.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -489,21 +494,21 @@ msgstr "Вже встановлена найновіша версія %s.\n"
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
 #, c-format
 msgid "%s set to manually installed.\n"
-msgstr "%s відмічений як встановлений вручну.\n"
+msgstr "%s позначений як встановлений вручну.\n"
 
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Обрано версію '%s' (%s) для '%s'\n"
+msgstr "Обрана версія '%s' (%s) для '%s'\n"
 
 #: cmdline/apt-get.cc:889
 #, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Обрано версію '%s' (%s) для '%s' тому, що '%s'\n"
+msgstr "Обрана версія '%s' (%s) для '%s' через '%s'\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
-msgstr "Виправлення залежностей…"
+msgstr "Виправлення залежностей..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
@@ -524,8 +529,7 @@ msgstr " Виконано"
 #: cmdline/apt-get.cc:1040
 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:1043
 msgid "Unmet dependencies. Try using -f."
@@ -541,7 +545,7 @@ msgstr "Автентифікаційне попередження не прий�
 
 #: cmdline/apt-get.cc:1079
 msgid "Install these packages without verification [y/N]? "
-msgstr "Встановити ці пакунки без перевірки [т/Н]? "
+msgstr "Встановити ці пакунки без перевірки [y/N]? "
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
@@ -549,20 +553,21 @@ msgstr "Деякі пакунки неможливо автентифікува�
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
-msgstr "Існують проблеми, а опція -y використана без --force-yes"
+msgstr "Виявлено проблеми, а опція -y була використана без --force-yes"
 
 #: cmdline/apt-get.cc:1131
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
-"Внутрішня помилка, InstallPackages була викликана зі зламаними пакунками!"
+"Внутрішня помилка, InstallPackages була викликана з непрацездатними "
+"пакунками!"
 
 #: cmdline/apt-get.cc:1140
 msgid "Packages need to be removed but remove is disabled."
-msgstr "Пакунки необхідно вилучити, але вилучення заборонене."
+msgstr "Необхідно видалити пакунки, але видалення заборонене."
 
 #: cmdline/apt-get.cc:1151
 msgid "Internal error, Ordering didn't finish"
-msgstr "Внутрішня помилка, Ordering не завершено"
+msgstr "Внутрішня помилка, Ordering не завершилася"
 
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
@@ -587,14 +592,16 @@ msgstr "Необхідно завантажити %sB архівів.\n"
 #: cmdline/apt-get.cc:1208
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Для цієї операції на диску буде використано %sB.\n"
+msgstr ""
+"Після цієї операції об'єм зайнятого дискового простору зросте на %sB.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Після цієї операції на диску буде звільнено %sБ місця\n"
+msgstr ""
+"Після цієї операції об'єм зайнятого дискового простору зменшиться на %sB.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
@@ -610,12 +617,11 @@ msgstr "Недостатньо вільного місця в %s."
 #: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
-"Запитане виконання тільки тривіальних операцій, але це не тривіальна "
-"операція."
+"Вказано виконання тільки тривіальних операцій, але це не тривіальна операція."
 
 #: cmdline/apt-get.cc:1259
 msgid "Yes, do as I say!"
-msgstr "Так, робити, що я кажу!"
+msgstr "Так, робити, як я скажу!"
 
 #: cmdline/apt-get.cc:1261
 #, c-format
@@ -634,7 +640,7 @@ msgstr "Перервано."
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "Бажаєте продовжити [Т/н]? "
+msgstr "Бажаєте продовжити [Y/n]? "
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -647,7 +653,7 @@ msgstr "Деякі файли не вдалося завантажити"
 
 #: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
 msgid "Download complete and in download only mode"
-msgstr "Вказано режим \"тільки завантаження\", і воно завершене"
+msgstr "Завантаження завершено в режимі \"тільки завантаження\""
 
 #: cmdline/apt-get.cc:1379
 msgid ""
@@ -677,34 +683,34 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-"Наступний пакунок зник з вашої системи, тому що\n"
-"всі файли були перезаписані іншими пакунками:"
+"Вказаний пакунок зник з вашої системи, так як\n"
+"усі файли були перезаписані іншими пакунками:"
 msgstr[1] ""
-"Наступні пакунки зникли з вашої системи, тому що\n"
-"всі файли були перезаписані іншими пакунками:"
+"Вказані пакунки зникли з вашої системи, так як\n"
+"усі файли були перезаписані іншими пакунками:"
 msgstr[2] ""
-"Наступні пакунки зникли з вашої системи, тому що\n"
-"всі файли були перезаписані іншими пакунками:"
+"Вказані пакунки зникли з вашої системи, так як\n"
+"усі файли були перезаписані іншими пакунками:"
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Примітка: це зроблено автоматично на вимогу dpkg"
+msgstr "Увага: це зроблено автоматично і умисно dpkg'ем."
 
 #: cmdline/apt-get.cc:1559
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Ігнорувати недоступний цільовий випуск '%s' пакунку '%s'"
+msgstr "Ігнорувати недоступний випуск '%s' пакунку '%s'"
 
 #: cmdline/apt-get.cc:1591
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Вибір '%s' в якості сирцевого пакунка замість '%s'\n"
+msgstr "Обираю '%s' як пакунок вихідних текстів, замість '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Ігнорувати недоступну версію '%s' пакунка '%s'"
+msgstr "Ігнорувати недоступну версію '%s' пакунку '%s'"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
@@ -712,15 +718,14 @@ msgstr "Команді update не потрібні аргументи"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
-"Не передбачувалося щось вилучати, неможливо запустити програму AutoRemover"
+msgstr "Нам не дозволено видаляти, неможливо запустити AutoRemover"
 
 #: cmdline/apt-get.cc:1815
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
-"Хм, виглядає так, що AutoRemover помилково знищив щось потрібне\n"
+"Хм, виглядає так, що AutoRemover помилково знищив щось потрібне.\n"
 "Будь-ласка відправте багрепорт щодо apt."
 
 #.
@@ -735,11 +740,11 @@ msgstr ""
 #.
 #: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
 msgid "The following information may help to resolve the situation:"
-msgstr "Наступна інформація можливо допоможе Вам:"
+msgstr "Наступна інформація можливо допоможе Вам виправити ситуацію:"
 
 #: cmdline/apt-get.cc:1822
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Внутрішня помилка, програма AutoRemover щось пошкодила"
+msgstr "Внутрішня Помилка, AutoRemover щось поламав"
 
 #: cmdline/apt-get.cc:1829
 msgid ""
@@ -757,20 +762,22 @@ msgstr[2] "Наступні пакунки були встановлені ав�
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Пакунок %lu був встановлений автоматично і більше потрібен.\n"
-msgstr[1] "Пакунки %lu були встановлені автоматично і більше не потрібні.\n"
-msgstr[2] "Пакунки %lu були встановлені автоматично і більше не потрібні.\n"
+msgstr[0] "%lu пакунок був встановлений автоматично і більше не потрібен.\n"
+msgstr[1] ""
+"%lu пакунка було встановлено автоматично і вони більше не потрібні.\n"
+msgstr[2] ""
+"%lu пакунків було встановлено автоматично і вони більше не потрібні.\n"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Використайте 'apt-get autoremove' для вилучення."
-msgstr[1] "Використайте 'apt-get autoremove' для вилучення."
-msgstr[2] "Використайте 'apt-get autoremove' для вилучення."
+msgstr[0] "Використовуйте 'apt-get autoremove' щоб видалити його."
+msgstr[1] "Використовуйте 'apt-get autoremove' щоб видалити їх."
+msgstr[2] "Використовуйте 'apt-get autoremove' щоб видалити їх."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Внутрішня помилка, AllUpgrade все поламав"
+msgstr "Внутрішня помилка, AllUpgrade щось поламав"
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
@@ -784,7 +791,7 @@ msgid ""
 "solution)."
 msgstr ""
 "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не "
-"вказуючи імені пакунка (або знайдіть інше рішення)."
+"вказуючи назв пакунків (або вкажіть рішення)."
 
 #: cmdline/apt-get.cc:1972
 msgid ""
@@ -816,28 +823,28 @@ msgstr "Рекомендовані пакунки:"
 #: cmdline/apt-get.cc:2152
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "Не можливо знайти пакунок %s"
+msgstr "Не можу знайти пакунок %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
 #, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s позначено як встановлений автоматично.\n"
+msgstr "%s позначений як автоматично встановлений.\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
-"Ця команда є застарілою.  Будь ласка, використовуйте замість неї 'apt-mark "
-"auto' та 'apt-mark manual'."
+"Ця команда застаріла. Будь-ласка, використовуйте замість неї 'apt-mark auto' "
+"і 'apt-mark manual'."
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Обчислення оновлень… "
+msgstr "Обчислення оновлень... "
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
-msgstr "Збій"
+msgstr "Невдача"
 
 #: cmdline/apt-get.cc:2191
 msgid "Done"
@@ -845,16 +852,16 @@ msgstr "Виконано"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Внутрішня помилка, розв’язувач проблем все поламав"
+msgstr "Внутрішня помилка, вирішувач проблем щось поламав"
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
-msgstr "Неможливо заблокувати теку для завантаження"
+msgstr "Неможливо заблокувати директорію для завантаження"
 
 #: cmdline/apt-get.cc:2386
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
-msgstr "Не вдалося знайти джерело для завантаження версії '%s' '%s'"
+msgstr "Неможливо знайти джерело для завантаження версії '%s' для '%s'"
 
 #: cmdline/apt-get.cc:2391
 #, c-format
@@ -878,7 +885,7 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"Увага: пакунок '%s' підтримується у системі керування версіями '%s' в:\n"
+"УВАГА: Пакування '%s' відбувається в системі контролю версій '%s' на:\n"
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
@@ -888,9 +895,9 @@ msgid ""
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Будь ласка, використовуйте:\n"
-"bzr branch %s,\n"
-"щоб отримати останнє (можливо невидане) оновлення для пакунка.\n"
+"Будь-ласка використовуйте:\n"
+"bzr branch %s\n"
+"щоб отримати найновіші (потенційно не випущені) оновлення до пакунку.\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -900,7 +907,7 @@ msgstr "Пропускаємо вже завантажений файл '%s'\n"
 #: cmdline/apt-get.cc:2603
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "Недостатньо місця на %s"
+msgstr "Недостатньо місця в %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -929,8 +936,7 @@ msgstr "Деякі архіви не вдалося завантажити."
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
-"Розпакування вихідних текстів пропущено, тому що в %s вже перебувають "
-"розпаковані вихідні тексти\n"
+"Пропускається розпакування вихідних текстів, тому що вже розпаковано в %s\n"
 
 #: cmdline/apt-get.cc:2704
 #, c-format
@@ -963,8 +969,8 @@ msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
-"Немає доступної інформації про архітектуру %s. Дивіться apt.conf(5) APT::"
-"Architectures для налаштувань"
+"Відсутня інформація про архітектуру для %s. Дивись apt.conf(5) APT::"
+"Архітектури для налащтування"
 
 #: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
 #, c-format
@@ -982,8 +988,8 @@ msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
-"%s залежності для %s не можуть бути задоволені, тому що %s не дозволені для "
-"'%s' пакунків"
+"Залежність типу %s для %s не може бути задоволена, бо %s не є дозволеним на "
+"'%s' пакунках"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -997,8 +1003,8 @@ msgstr ""
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений "
-"пакунок %s новіше, аніж треба"
+"Не вдалося задовольнити залежність типу %s для %s: Встановлений пакунок %s "
+"новіше, аніж треба"
 
 #: cmdline/apt-get.cc:3088
 #, c-format
@@ -1006,8 +1012,8 @@ msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"%s залежності для %s не можуть бути задоволені, тому що версія-кандидат "
-"пакунка %s, не задовольняє вимогам версії"
+"Залежність типу %s для %s не може бути задоволена, бо версія пакунку-"
+"кандидата %s не задовольняє умови по версіям"
 
 #: cmdline/apt-get.cc:3094
 #, c-format
@@ -1015,8 +1021,8 @@ msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
-"%s залежності для %s не можуть бути задоволені, тому що пакунок %s не має "
-"версії кандидата"
+"Залежність типу %s для %s не може бути задоволена, бо немає пакунку-"
+"кандидата %s потрібної версії"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -1035,7 +1041,7 @@ msgstr "Обробка залежностей для побудови закін
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
 #, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Зміни для  %s (%s)"
+msgstr "Журнал змін для %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
@@ -1086,48 +1092,52 @@ msgid ""
 "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"
+"Використання: apt-get [опції] команда\n"
+"               apt-get [опції] install|remove пакунок1 [пкн2 ...]\n"
+"               apt-get [опції] source пакунок1 [пкн2 ...]\n"
 "\n"
-"apt-get це проста команда для інтерфейсу командного рядка\n"
-"для завантаження та встановлення пакунків. Найчастіше\n"
-"використовувані команди - це update та install.\n"
+"apt-get - простий інтерфейс командного рядка для завантаження й\n"
+"встановлення пакунків. Найбільш часто використовувані команди - update\n"
+"і install.\n"
 "\n"
 "Команди:\n"
-"   update - отримати новий список пакунків\n"
-"   upgrade - виконати оновлення системи\n"
-"   install - встановити пакунок (пакунок це libc6, не libc6.deb)\n"
-"   remove - вилучення пакунків\n"
-"   autoremove - автоматичне вилучення пакунків, що не використовуються\n"
-"   purge - вилучення пакунків разом із файлами налаштувань\n"
-"   source - завантаження архівів з сирцями\n"
-"   build-dep - налаштувати залежності пакунків з сирцями\n"
-"   dist-upgrade - оновити дистрибутив, дивіться apt-get (8)\n"
-"   dselect-upgrade - слідкувати за виділенням dselect\n"
-"   clean - стерти завантажені файли архівів\n"
-"   autoclean - стерти старі завантажені файли архівів\n"
-"   check - перевірити, чи немає поламаних залежностей\n"
-"   changelog - завантажити і вивести журнал змін для вказаного пакунка\n"
-"   download - завантажити бінарний пакунок до вказаної теки\n"
+"   update - завантажити нові переліки пакунків\n"
+"   upgrade - виконати оновлення пакунків\n"
+"   install - встановити нові пакунки (назва пакунка вказується\n"
+"             як libc6, а не libc6.deb)\n"
+"   remove - видалити пакунки\n"
+"   autoremove - видалити автоматично усі пакунки, що не використовуються\n"
+"   purge - видалити пакунки разом з іхніми конфігураційними файлами\n"
+"   source - завантажити архіви з вихідними текстами\n"
+"   build-dep - завантажити все необхідне для побудови зазначеного\n"
+"               пакунку з вихідних текстів\n"
+"   dist-upgrade - оновити всю систему, докладніше в apt-get(8)\n"
+"   dselect-upgrade - керуватися вибором, зробленим у dselect\n"
+"   clean - видалити завантажені архіви\n"
+"   autoclean - видалити старі завантажені архіви\n"
+"   check - перевірити наявність порушених залежностей\n"
+"   changelog - завантажити і показати журнал змін для визначеного пакунку\n"
+"   download - завантажити двійковий пакунок у поточну директорію\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 має Super Cow Powers.\n"
+"Опції:\n"
+"  -h  Цей текст допомоги.\n"
+"  -q  Виводити повідомлення, придатні для запису у файл журналу.\n"
+"      Не виводити індикатор прогресу\n"
+"  -qq Виводити тільки повідомлення про помилки\n"
+"  -d  Тільки завантажити - не встановлювати й не розпаковувати архіви\n"
+"  -s  Не виконувати реальних дій. Імітація роботи\n"
+"  -y  Відповідати 'Так' на всі запитання. Самі запитання при цьому не\n"
+"      виводяться\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/apt-get.cc:3575
 msgid ""
@@ -1136,11 +1146,10 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"ПРИМІТКА: Це лише симуляція!\n"
-"      apt-get потребує привілеїв супер-користувача (root) для дійсного "
-"виконання.\n"
-"      Також зауважте, що блокування деактивоване, отже не покладайтеся\n"
-"      на відповідність результатів дійсного поточного стану!"
+"УВАГА: Це тільки симуляція!\n"
+"       apt-get потребує права root для реального запуску.\n"
+"       Також не забувайте, що блокування вимикається,\n"
+"       тому не очікуйте на відповідність поточній реальній ситуації!"
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
@@ -1166,7 +1175,7 @@ msgstr "Отримано %sB за %sB (%sB/s)\n"
 #: cmdline/acqprogress.cc:230
 #, c-format
 msgid " [Working]"
-msgstr " [Обробка]"
+msgstr " [Йде робота]"
 
 #: cmdline/acqprogress.cc:286
 #, c-format
@@ -1177,52 +1186,52 @@ msgid ""
 msgstr ""
 "Зміна носія: вставте диск з міткою\n"
 " '%s'\n"
-"у пристрій '%s' і натисніть «enter»\n"
+"у пристрій '%s' і натисніть Enter\n"
 
 #: cmdline/apt-mark.cc:55
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "%s не може бути позначений, так як він не встановлений.\n"
+msgstr "%s не може бути позначений, тому що він не встановлений.\n"
 
 #: cmdline/apt-mark.cc:61
 #, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s вже був позначений як встановлений вручну.\n"
+msgstr "%s вже був позначений, як встановлений вручну.\n"
 
 #: cmdline/apt-mark.cc:63
 #, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s вже був позначений як встановлений автоматично.\n"
+msgstr "%s вже був позначений, як автоматично встановлений.\n"
 
 #: cmdline/apt-mark.cc:228
 #, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s вже був позначений як зафіксований.\n"
+msgstr "%s вже був зафіксований.\n"
 
 #: cmdline/apt-mark.cc:230
 #, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s вже був не зафіксований.\n"
+msgstr "%s вже був незафіксований.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "Очікується на %s але його тут немає"
+msgstr "Очікував на %s, але його там не було"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
 #, c-format
 msgid "%s set on hold.\n"
-msgstr "%s вже позначений як зафіксований.\n"
+msgstr "%s зафіксовано.\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
 #, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Відмінити фіксування для %s.\n"
+msgstr "Фіксацію для %s відмінено.\n"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
-msgstr "Виконання dpkg не вдалося. Ви супер-користувач?"
+msgstr "Не вдалося виконати dpkg. Ви root?"
 
 #: cmdline/apt-mark.cc:379
 msgid ""
@@ -1245,38 +1254,38 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
-"Використання: apt-mark [параметри] {auto|manual} pkg1 [pkg2 …]\n"
+"Використання: apt-mark [опції] {auto|manual} пакунок1 [пакунок2 ...]\n"
 "\n"
-"apt-mark — простий інструмент командного рядка для маркування\n"
-"встановлених автоматично чи вручну пакунків. Він також може\n"
-"показувати встановлені позначки.\n"
+"apt-mark - це простий інтерфейс командного рядка для позначення\n"
+"пакунків як встановлені вручну, або автоматично. Він також уміє\n"
+"показувати позначки.\n"
 "\n"
 "Команди:\n"
-"   auto – Позначає пакунок як встановлений автоматично\n"
-"   manual – Позначає пакунок як встановлений вручну\n"
+"   auto - позначити вказані пакунки як автоматично встановлені\n"
+"   manual - позначити вказані пакунки як встановлені вручну\n"
 "\n"
-"Параметри:\n"
-"  -h  Цей текст довідки.\n"
-"  -q  Вивід до файлу журналу, без індикатора перебігу процесу\n"
+"Опції:\n"
+"  -h   Цей текст допомоги.\n"
+"  -q   Не показувати індикатор прогресу.\n"
 "  -qq Виводити тільки повідомлення про помилки\n"
-"  -s  Без виконання. Тільки друкувати те що має бути зроблено\n"
-"  -f  читати/записати маркування у заданий файл\n"
-"  -c=? Брати налаштування з вказаного файлу\n"
-"  -o=? Задати довільні параметри налаштувань, напр. -o dir::cache=/tmp\n"
-"Див. довідку apt-mark(8) та apt.conf(5) для отримання докладної інформації."
+"  -s  Не виконувати реальних дій. Імітація роботи\n"
+"  -f   Читати/писати позначки авто/вручну у вказаному файлі\n"
+"  -c=? Читати зазначений файл конфігурації.\n"
+"  -o=? Встановити умовну опцію конфігурації, наприклад, -o dir::cache=/tmp\n"
+"Для докладної інформації дивіться керівництва для apt-mark(8) і apt.conf(5)."
 
 #: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
-msgstr "Не вдалося прочитати базу даних компакт-диску %s"
+msgstr "Неможливо прочитати базу %s з cdrom"
 
 #: methods/cdrom.cc:212
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
-"Будь-ласка використовуйте apt-cdrom, щоб APT розпізнав цей CD-ROM, apt-get "
-"update не може бути використаним для додання нових CD"
+"Будь-ласка запустіть apt-cdrom, щоб APT розпізнав цей CD-ROM, apt-get update "
+"не може додавати нові CD-ROM"
 
 #: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
@@ -1285,7 +1294,8 @@ msgstr "Невірний CD-ROM"
 #: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Неможливо демонтувати CDROM в %s, можливо він все ще використовується."
+msgstr ""
+"Неможливо відмонтувати CDROM в %s, можливо він все ще використовується."
 
 #: methods/cdrom.cc:254
 msgid "Disk not found."
@@ -1297,8 +1307,9 @@ msgstr "Файл не знайдено"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
+#, fuzzy
 msgid "Failed to stat"
-msgstr "Не вдалося одержати атрибути"
+msgstr "Не вдалося одержати атрибути (stat)"
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
@@ -1306,12 +1317,12 @@ msgstr "Не вдалося встановити час модифікації"
 
 #: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "Невірне посилання, локальні посилання повинні починатися з //"
+msgstr "Невірне посилання (URI), локальні посилання не повинні починатися з //"
 
 #. Login must be before getpeername otherwise dante won't work.
 #: methods/ftp.cc:173
 msgid "Logging in"
-msgstr "Вхід"
+msgstr "Логінюсь в"
 
 #: methods/ftp.cc:179
 msgid "Unable to determine the peer name"
@@ -1324,48 +1335,48 @@ msgstr "Неможливо визначити локальну назву"
 #: methods/ftp.cc:215 methods/ftp.cc:243
 #, c-format
 msgid "The server refused the connection and said: %s"
-msgstr "Сервер розірвав з’єднання і повідомив: %s"
+msgstr "Сервер розірвав з'єднання, відповівши: %s"
 
 #: methods/ftp.cc:221
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "Збій команди USER, повідомлення серверу: %s"
+msgstr "USER невдало, сервер мовив: %s"
 
 #: methods/ftp.cc:228
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "Збій команди PASS, повідомлення серверу: %s"
+msgstr "PASS невдало, сервер мовив: %s"
 
 #: methods/ftp.cc:248
 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:276
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "Збій команди '%s' сценарію входу, повідомлення серверу: %s"
+msgstr "Команда '%s' у скрипті логіна не вдалася, сервер мовив: %s"
 
 #: methods/ftp.cc:302
 #, c-format
 msgid "TYPE failed, server said: %s"
-msgstr "Збій команди TYPE, повідомлення серверу: %s"
+msgstr "TYPE невдало, сервер мовив: %s"
 
 #: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
 msgid "Connection timeout"
-msgstr "Час з’єднання вичерпаний"
+msgstr "Час з'єднання вичерпався"
 
 #: methods/ftp.cc:346
 msgid "Server closed the connection"
-msgstr "Сервер закрив з’єднання"
+msgstr "Сервер закрив з'єднання"
 
 #: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
 #: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
 msgid "Read error"
-msgstr "Помилка читання"
+msgstr "Помилка зчитування"
 
 #: methods/ftp.cc:356 methods/rsh.cc:206
 msgid "A response overflowed the buffer."
@@ -1387,15 +1398,15 @@ msgstr "Неможливо створити сокет (socket)"
 
 #: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
-msgstr "Неможливо під’єднати сокет (socket) з даними, час з’єднання вичерпаний"
+msgstr "Неможливо під'єднати сокет (socket) з даними, час з'єднання вичерпався"
 
 #: methods/ftp.cc:713
 msgid "Could not connect passive socket."
-msgstr "Неможливо під’єднати пасивний сокет (passive socket)."
+msgstr "Неможливо під'єднати пасивний сокет (passive socket)."
 
 #: methods/ftp.cc:730
 msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo не зміг прослуховувати сокет"
+msgstr "Виклик getaddrinfo не зміг отримати слухаючий сокет"
 
 #: methods/ftp.cc:744
 msgid "Could not bind a socket"
@@ -1403,7 +1414,7 @@ msgstr "Неможливо приєднатися до сокета"
 
 #: methods/ftp.cc:748
 msgid "Could not listen on the socket"
-msgstr "Сокет не можливо прослухати"
+msgstr "Неможливо прослухати на сокеті"
 
 #: methods/ftp.cc:755
 msgid "Could not determine the socket's name"
@@ -1416,38 +1427,38 @@ msgstr "Неможливо відіслати команду PORT"
 #: methods/ftp.cc:797
 #, c-format
 msgid "Unknown address family %u (AF_*)"
-msgstr "Невідоме родина адрес %u (AF_*)"
+msgstr "Невідоме адресове сімейство %u (AF_*)"
 
 #: methods/ftp.cc:806
 #, c-format
 msgid "EPRT failed, server said: %s"
-msgstr "Збій команди EPRT, повідомлення серверу: %s"
+msgstr "EPRT невдало, сервер мовив: %s"
 
 #: methods/ftp.cc:826
 msgid "Data socket connect timed out"
-msgstr "Час з’єднання з сокетом вичерпаний"
+msgstr "Час з'єднання з сокетом даних вичерпався"
 
 #: methods/ftp.cc:833
 msgid "Unable to accept connection"
-msgstr "Неможливо прийняти з’єднання"
+msgstr "Неможливо прийняти з'єднання"
 
 #: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
 msgid "Problem hashing file"
-msgstr "Проблема хешування файлу"
+msgstr "Проблема хешування файла"
 
 #: methods/ftp.cc:885
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "Неможливо завантажити файл, повідомлення серверу: '%s'"
+msgstr "Неможливо завантажити файл, сервер мовив: '%s'"
 
 #: methods/ftp.cc:900 methods/rsh.cc:330
 msgid "Data socket timed out"
-msgstr "Час з’єднання з сокетом (socket) з даними вичерпаний"
+msgstr "Час з'єднання з сокетом (socket) з даними вичерпався"
 
 #: methods/ftp.cc:930
 #, c-format
 msgid "Data transfer failed, server said '%s'"
-msgstr "Передача даних обірвалася, повідомлення серверу: '%s'"
+msgstr "Передача даних обірвалася, сервер мовив '%s'"
 
 #. Get the files information
 #: methods/ftp.cc:1007
@@ -1461,7 +1472,7 @@ msgstr "Неможливо викликати "
 #: methods/connect.cc:75
 #, c-format
 msgid "Connecting to %s (%s)"
-msgstr "З’єднання з %s (%s)"
+msgstr "З'єднання з %s (%s)"
 
 #: methods/connect.cc:86
 #, c-format
@@ -1476,29 +1487,29 @@ msgstr "Неможливо створити сокет для %s (f=%u t=%u p=%u
 #: methods/connect.cc:99
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Неможливо ініціалізувати з’єднання з %s:%s (%s)."
+msgstr "Неможливо почати з'єднання з %s:%s (%s)."
 
 #: methods/connect.cc:107
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Неможливо з’єднатися з %s:%s (%s), час з’єднання вичерпаний"
+msgstr "Неможливо з'єднатися з %s:%s (%s), час з'єднання вичерпався"
 
 #: methods/connect.cc:125
 #, 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:153 methods/rsh.cc:433
 #, c-format
 msgid "Connecting to %s"
-msgstr "З’єднання з %s"
+msgstr "З'єднання з %s"
 
 #: methods/connect.cc:172 methods/connect.cc:191
 #, c-format
 msgid "Could not resolve '%s'"
-msgstr "Не можу знайти IP адресу для %s"
+msgstr "Не можу знайти IP адрес для %s"
 
 #: methods/connect.cc:197
 #, c-format
@@ -1508,12 +1519,12 @@ msgstr "Тимчасова помилка при отриманні IP адре�
 #: methods/connect.cc:200
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Трапилось щось зле під час розв’язання '%s:%s' (%i - %s)"
+msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
 
 #: methods/connect.cc:247
 #, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Не вдається підключитися до %s:%s:"
+msgstr "Неможливо під'єднатися до %s:%s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1528,7 +1539,7 @@ msgstr "Знайдено як мінімум один невірний підп�
 
 #: methods/gpgv.cc:189
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи gpgv встановлено?)"
+msgstr "Неможливо виконати 'gpgv' для перевірки підпису (чи встановлено gpgv?)"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1543,12 +1554,12 @@ msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
-"Наступні підписи не можуть бути перевірені, тому що, публічний ключ "
+"Наступні підписи не можуть бути перевірені, тому що публічний ключ "
 "відсутній:\n"
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
-msgstr "Пусті файли не можуть бути вірними архівами"
+msgstr "Пусті файли не можуть бути правильними архівами"
 
 #: methods/http.cc:394
 msgid "Waiting for headers"
@@ -1556,19 +1567,19 @@ msgstr "Очікування на заголовки"
 
 #: methods/http.cc:544
 msgid "Bad header line"
-msgstr "Невірна лінія заголовку"
+msgstr "Невірний рядок заголовку"
 
 #: methods/http.cc:569 methods/http.cc:576
 msgid "The HTTP server sent an invalid reply header"
-msgstr "HTTP сервер надіслав невірний заголовок 'reply'"
+msgstr "HTTP сервер відіслав невірний заголовок 'reply'"
 
 #: methods/http.cc:606
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "HTTP сервер надіслав невірний заголовок 'Content-Length'"
+msgstr "HTTP сервер відіслав невірний заголовок 'Content-Length'"
 
 #: methods/http.cc:621
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "HTTP сервер надіслав невірний заголовок 'Content-Length'"
+msgstr "HTTP сервер відіслав невірний заголовок 'Content-Range'"
 
 #: methods/http.cc:623
 msgid "This HTTP server has broken range support"
@@ -1580,39 +1591,39 @@ msgstr "Невідомий формат дати"
 
 #: methods/http.cc:818
 msgid "Select failed"
-msgstr "Вибір не вдався"
+msgstr "Вибір провалився"
 
 #: methods/http.cc:823
 msgid "Connection timed out"
-msgstr "Час очікування з’єднання вичерпаний"
+msgstr "Час очікування з'єднання вийшов"
 
 #: methods/http.cc:846
 msgid "Error writing to output file"
-msgstr "Помилка запису в вихідний файл"
+msgstr "Помилка запису у вихідний файл"
 
 #: methods/http.cc:877
 msgid "Error writing to file"
-msgstr "Помилка запису до файлу"
+msgstr "Помилка запису у файл"
 
 #: methods/http.cc:905
 msgid "Error writing to the file"
-msgstr "Помилка запису до файлу"
+msgstr "Помилка запису у файл"
 
 #: methods/http.cc:919
 msgid "Error reading from server. Remote end closed connection"
-msgstr "Помилка читання з сервера. Віддалена сторона закрила з’єднання"
+msgstr "Помилка зчитування з сервера. Віддалена сторона закрила з'єднання"
 
 #: methods/http.cc:921
 msgid "Error reading from server"
-msgstr "Помилка читання з сервера"
+msgstr "Помилка зчитування з сервера"
 
 #: methods/http.cc:1194
 msgid "Bad header data"
-msgstr "Погана заголовна інформація"
+msgstr "Погана заголовкова інформація"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
-msgstr "Помилка з’єднання"
+msgstr "З'єднання не вдалося"
 
 #: methods/http.cc:1358
 msgid "Internal error"
@@ -1635,21 +1646,21 @@ msgstr "Неможливо прочитати %s"
 #: apt-pkg/clean.cc:123
 #, c-format
 msgid "Unable to change to %s"
-msgstr "Неможливо зробити зміни у %s"
+msgstr "Неможливо змінити на %s"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Для файла '%s' дзеркала не знайдено "
+msgstr "Не знайдено файла дзеркала '%s' "
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
 #, c-format
 msgid "Can not read mirror file '%s'"
-msgstr "Не вдається прочитати дзеркальний файл '%s'"
+msgstr "Неможливо прочитати файл дзеркала '%s'"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1662,6 +1673,8 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
+"Неможливо пропатчити %s з mmap і з 'file operation usage' - патч виглядає "
+"пошкодженим."
 
 #: methods/rred.cc:496
 #, c-format
@@ -1669,10 +1682,12 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
+"Неможливо пропатчити %s з mmap (але не видно конкретної вини mmap) - патч "
+"виглядає пошкодженим."
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Не вдалося створити IPC-канал для породженого процесу"
+msgstr "Не вдалося створити IPC канал для підпроцесу"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
@@ -1680,7 +1695,7 @@ msgstr "З'єднання завершено передчасно"
 
 #: dselect/install:32
 msgid "Bad default setting!"
-msgstr "Неправильні типові налаштування!"
+msgstr "Неправильне значення за умовчанням!"
 
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
 #: dselect/install:105 dselect/update:45
@@ -1689,37 +1704,38 @@ msgstr "Для продовження натисніть Enter."
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Чи бажаєте ви вилучити всі завантажені раніше файли .deb"
+msgstr "Чи хочете ви видалити всі раніше завантажені .deb файли?"
 
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Деякі помилки завадили розархівуванню. Пакунки, що були встановлені"
+msgstr ""
+"Під час розпакування виникли якісь помилки. Пакунки, які були встановлені"
 
 #: dselect/install:102
 msgid "will be configured. This may result in duplicate errors"
-msgstr "будуть налаштовані. Це може спричинити помилки дублювання"
+msgstr "будуть налаштовані. Це може призвести до повторення помилок"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr ""
-"або помилки спричинені незадоволеними залежностями. Це нормально, тільки "
+"або виникнення нових через незадоволені залежності. Це нормально,тільки "
 "помилки"
 
 #: dselect/install:104
 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 "Об’єднання інформації про доступні пакунки"
+msgstr "Об'єднання доступної інформації"
 
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s не є правильним DEB-пакунком."
+msgstr "%s не є правильним DEB пакунком."
 
 #: cmdline/apt-extracttemplates.cc:236
 msgid ""
@@ -1734,14 +1750,14 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Використання: apt-extracttemplates file1 [file2 …]\n"
+"Використання: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 "apt-extracttemplates витягує з пакунків Debian конфігураційні скрипти\n"
 "і файли-шаблони\n"
 "\n"
 "Опції:\n"
 "  -h   Цей текст\n"
-"  -t   Встановити теку для тимчасових файлів\n"
+"  -t   Встановити директорію для тимчасових файлів\n"
 "  -c=? Читати зазначений конфігураційний файл\n"
 "  -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n"
 
@@ -1763,7 +1779,7 @@ msgstr "Список розширень, припустимих для паку�
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
-msgstr "Помилка обробки теки %s"
+msgstr "Помилка обробки директорії %s"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1846,7 +1862,7 @@ msgstr ""
 "\n"
 "Команди 'packages' і 'sources' треба виконувати, перебуваючи в кореневій "
 "теці\n"
-"дерева, яке ви бажаєте обробити. BinaryPath повинен вказувати на місце,\n"
+"дерева, що ви хочете обробити. BinaryPath повинен вказувати на місце,\n"
 "з якого починається рекурсивний обхід, а файл перепризначень (override)\n"
 "повинен містити запис про перепризначення керуючих полів. Якщо був "
 "зазначений\n"
@@ -1880,7 +1896,7 @@ msgstr "У групі пакунків '%s' відсутні деякі файл
 #: ftparchive/cachedb.cc:47
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "БД була пошкоджена, файл перейменований в %s.old"
+msgstr "БД була пошкоджена, файл перейменований на %s.old"
 
 #: ftparchive/cachedb.cc:65
 #, c-format
@@ -1892,8 +1908,8 @@ msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Некоректний формат БД. Якщо ви оновлювалися зі старішої версії apt, будь "
-"ласка, вилучіть базу даних, та створіть її заново."
+"Невірний формат БД. Якщо ви оновилися зі старої версії apt, будь-ласка "
+"видаліть і наново створіть базу-даних."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1908,7 +1924,7 @@ msgstr "Не вдалося одержати атрибути %s"
 
 #: ftparchive/cachedb.cc:249
 msgid "Archive has no control record"
-msgstr "В архіві немає поля control"
+msgstr "В архіві немає запису 'control'"
 
 #: ftparchive/cachedb.cc:490
 msgid "Unable to get a cursor"
@@ -1917,29 +1933,29 @@ msgstr "Неможливо одержати курсор"
 #: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "W: Не вдалося прочитати теку %s\n"
+msgstr "У: Не вдалося прочитати директорію %s\n"
 
 #: ftparchive/writer.cc:85
 #, c-format
 msgid "W: Unable to stat %s\n"
-msgstr "W: Неможливо прочитати атрибути %s\n"
+msgstr "У: Неможливо прочитати атрибути %s\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "E: "
+msgstr "П: "
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "W: "
+msgstr "У: "
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "E: Помилки відносяться до файлу "
+msgstr "П: Помилки відносяться до файлу "
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "Не вдалося розв’язати %s"
+msgstr "Не вдалося визначити %s"
 
 #: ftparchive/writer.cc:181
 msgid "Tree walking failed"
@@ -1953,17 +1969,17 @@ msgstr "Не вдалося відкрити %s"
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " DeLink %s [%s]\n"
+msgstr "DeLink %s [%s]\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "Не вдалося прочитати посилання %s"
+msgstr "Не вдалося прочитати посилання (readlink) %s"
 
 #: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "Не вдалося від’єднати %s"
+msgstr "Не вдалося видалити посилання (unlink) %s"
 
 #: ftparchive/writer.cc:286
 #, c-format
@@ -1973,60 +1989,60 @@ msgstr "*** Не вдалося створити посилання %s на %s"
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " Перевищено ліміт в %s в DeLink.\n"
+msgstr " Перевищено ліміт в %sB в DeLink.\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
-msgstr "В архіві немає поля package"
+msgstr "Архів не мав поля 'package'"
 
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no override entry\n"
-msgstr "  Відсутній запис про перепризначення для %s\n"
+msgstr "  Відсутній запис про перепризначення (override) для %s\n"
 
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  пакунок %s супроводжує %s, а не %s\n"
+msgstr "  пакунок %s супроводжується %s, а не %s\n"
 
 #: ftparchive/writer.cc:721
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no source override entry\n"
-msgstr "  %s не має запису про переназначенні джерела\n"
+msgstr "  Відсутній запис про перепризначення вихідних текстів для %s\n"
 
 #: ftparchive/writer.cc:725
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr "  %s не має запису про перепризначення бінарного файлу або\n"
+msgstr "  Крім того, відсутній запис про бінарне перепризначення для %s\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - не вдалося виділити пам'ять"
+msgstr "realloc - Не вдалося виділити пам'ять"
 
 #: ftparchive/override.cc:35 ftparchive/override.cc:143
 #, c-format
 msgid "Unable to open %s"
-msgstr "Не вдається відкрити %s"
+msgstr "Не вдалося відкрити %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Спотворення перепризначення %s рядок %llu #1"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Спотворення перепризначення %s рядок %llu #2"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Спотворення перепризначення %s рядок %llu #3"
+msgstr "Спотворений запис про перепризначення (override) %s на рядку %llu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "Не вдалося прочитати файл перепризначень (override)%s"
+msgstr "Не вдалося прочитати файл перепризначень (override) %s"
 
 #: ftparchive/multicompress.cc:70
 #, c-format
@@ -2036,7 +2052,7 @@ msgstr "Невідомий алгоритм стиснення '%s'"
 #: ftparchive/multicompress.cc:100
 #, c-format
 msgid "Compressed output %s needs a compression set"
-msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути пакування"
+msgstr "Для отримання стиснутого виводу %s необхідно ввімкнути стиснення"
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
@@ -2044,7 +2060,7 @@ msgstr "Не вдалося створити FILE*"
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
-msgstr "Спроба розгалуження зазнала невдачі"
+msgstr "Не вдалося породити процес (fork)"
 
 #: ftparchive/multicompress.cc:206
 msgid "Compress child"
@@ -2057,21 +2073,21 @@ msgstr "Внутрішня помилка, не вдалося створити
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
-msgstr "Помилка вводу/виводу в підпроцес/файл"
+msgstr "Помилка уведення/виводу в підпроцес/файл"
 
 #: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
-msgstr "Помилка читання під час обчислення MD5"
+msgstr "Помилка зчитування під час обчислення MD5"
 
 #: ftparchive/multicompress.cc:358
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "Не вдалося роз’єднати %s"
+msgstr "Не вдалося видалити %s"
 
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "Не вдалося перейменувати %s в %s"
+msgstr "Не вдалося перейменувати %s на %s"
 
 #: cmdline/apt-internal-solver.cc:37
 msgid ""
@@ -2086,10 +2102,22 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Використання: apt-internal-solver\n"
+"\n"
+"apt-internal-solver це інтерфейс для використання поточного\n"
+"внутрішнього розв'язувача (як зовнішнього) для АРТ програм\n"
+"для дебагу чи інших цілей\n"
+"\n"
+"Опції:\n"
+"  -h     Цей текст допомоги.\n"
+"  -q     Виводити повідомлення, придатні для запису у файл журналу.\n"
+"          Не виводити індикатор прогресу\n"
+"  -c=? Читати зазначений конфігураційний файл\n"
+"  -o=? Вказати умовну опцію, наприклад, -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
-msgstr "Запис про невідомий пакунок!"
+msgstr "Невідомий запис про пакунок!"
 
 #: cmdline/apt-sortpkgs.cc:153
 msgid ""
@@ -2104,7 +2132,7 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Використання: apt-sortpkgs [параметри] файл11 [файл2 …]\n"
+"Використання: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 "apt-sortpkgs - простий інструмент для сортування переліків пакунків. Опція -"
 "s\n"
@@ -2122,7 +2150,7 @@ msgstr "Не вдалося створити канали (pipes)"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Не вдалося виконати компресор gzip "
+msgstr "Не вдалося виконати gzip "
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2130,12 +2158,12 @@ msgstr "Пошкоджений архів"
 
 #: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
-msgstr "Контрольна сума tar архіву невірна, архів пошкоджений"
+msgstr "Контрольна сума tar архіва невірна, архів пошкоджений"
 
 #: apt-inst/contrib/extracttar.cc:303
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
-msgstr "Невідомий тип заголовку TAR %u, член %s"
+msgstr "Невідомий тип заголовку TAR - %u, член %s"
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
@@ -2143,16 +2171,17 @@ msgstr "Невірний підпис архіву"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
-msgstr "Неможливо прочитати заголовок \"member\" архіву"
+msgstr "Неможливо прочитати заголовок 'member' в архіві"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr "Помилковий заголовок  \"member\" архіву  %s"
+msgstr "Невірний заголовок 'member' %s в архіві"
 
 #: apt-inst/contrib/arfile.cc:106
+#, fuzzy
 msgid "Invalid archive member header"
-msgstr "Помилковий заголовок  \"member\" архіву"
+msgstr "Невірний заголовок 'member' в архіві"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
@@ -2160,43 +2189,44 @@ msgstr "Архів занадто малий"
 
 #: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
-msgstr "Не вдалося прочитати заголовки архіву"
+msgstr "Не вдалося прочитати заголовки в архіві"
 
 #: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
-msgstr "DropNode викликано для все ще зв’язаного вузла"
+msgstr "DropNode було викликано для вузла, що ще використовувався"
 
 #: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
-msgstr "Не вдалося знайти елемент хешу!"
+msgstr "Не вдалося знайти елемент хеша!"
 
 #: apt-inst/filelist.cc:461
+#, fuzzy
 msgid "Failed to allocate diversion"
-msgstr "Неможливо визначити перенаправлення"
+msgstr "Не вдалося створити diversion"
 
 #: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
 msgstr "Внутрішня помилка в AddDiversion"
 
 #: apt-inst/filelist.cc:479
-#, c-format
+#, fuzzy, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Намагаюсь перезаписати перенаправлення, %s -> %s і %s/%s"
+msgstr "Спроба перезапису diversion, %s -> %s і %s/%s"
 
 #: apt-inst/filelist.cc:508
-#, c-format
+#, fuzzy, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "Подвійне додавання перенаправлення %s -> %s"
+msgstr "Подвійне додавання diversion %s -> %s"
 
 #: apt-inst/filelist.cc:551
 #, c-format
 msgid "Duplicate conf file %s/%s"
-msgstr "Копія файлу налаштувань %s/%s"
+msgstr "Копія конфігураційного файлу %s/%s"
 
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, c-format
 msgid "Failed to write file %s"
-msgstr "Не вдається записати файл %s"
+msgstr "Не вдалося записати файл %s"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
@@ -2211,30 +2241,32 @@ 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
+#, fuzzy, c-format
 msgid "The directory %s is diverted"
-msgstr "Тека %s перенаправлена"
+msgstr "Директорія %s є відхиленою (diverted)"
 
 #: apt-inst/extract.cc:147
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Пакунок намагається писати до перенаправленої цілі %s/%s"
+msgstr "Пакунок пробує записати у ціль з diversion %s/%s"
 
 #: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#, fuzzy
 msgid "The diversion path is too long"
-msgstr "Шлях перенаправлення занадто довгий"
+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
+#, fuzzy
 msgid "Failed to locate node in its hash bucket"
-msgstr "Не вдалося розмістити вузол у хеші"
+msgstr "Не вдалося знайти вузол у його наборі хешів"
 
 #: apt-inst/extract.cc:287
 msgid "The path is too long"
@@ -2243,12 +2275,12 @@ msgstr "Шлях занадто довгий"
 #: apt-inst/extract.cc:415
 #, c-format
 msgid "Overwrite package match with no version for %s"
-msgstr "Переписати зіставлення пакунка буз версій для %s"
+msgstr "Перезаписати відповідність пакунка без версії для %s"
 
 #: apt-inst/extract.cc:432
 #, 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:492
 #, c-format
@@ -2264,8 +2296,7 @@ msgstr "Невірний DEB архів, відсутній член '%s'"
 #: apt-inst/deb/debfile.cc:55
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-"Цей файл не є дійсним DEB архівом, він не має  ні '%s', ні '%s' або '%s'"
+msgstr "Це невірний DEB архів, відсутній член '%s', '%s' чи '%s'"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
@@ -2278,25 +2309,25 @@ msgstr "Контрольний файл не можливо обробити"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
-msgstr "Неможливо відобразити в пам’яті пустий файл"
+msgstr "Неможливо відобразити в пам'яті (mmap) пустий файл"
 
 #: apt-pkg/contrib/mmap.cc:111
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Не можливо виконати дублювання файлу опису %i"
+msgstr "Неможливо створити копію файлового дескриптора %i"
 
 #: apt-pkg/contrib/mmap.cc:119
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Неможливо відобразити в пам’яті %llu байт"
+msgstr "Неможливо зробити mmap для %llu байт"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
-msgstr "Неможливо закрити mmap"
+msgstr "Не вдалося закрити mmap"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Не вдалося синхронізувати mmap"
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2308,11 +2339,13 @@ msgid "Failed to truncate file"
 msgstr "Не вдалося обрізати файл"
 
 #: apt-pkg/contrib/mmap.cc:341
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
+"Динамічний MMap використав усе місце. Будь-ласка, збільшіть розмір APT::"
+"Cache-Start. Поточне значення: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:440
 #, c-format
@@ -2320,35 +2353,38 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
+"Неможливо збільшити розмір MMap, так як обмеження в %lu байт вже досягнуто."
 
 #: apt-pkg/contrib/mmap.cc:443
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
+"Неможливо збільшити розмір MMap, так як автоматичне збільшення вимкнено "
+"користувачем."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:372
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr "%lid %lih %limin %lis"
+msgstr "%liд %liг %liхв %liс"
 
 #. h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:379
 #, c-format
 msgid "%lih %limin %lis"
-msgstr "%lih %limin %lis"
+msgstr "%liг %liхв %liс"
 
 #. min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:386
 #, c-format
 msgid "%limin %lis"
-msgstr "%limin %lis"
+msgstr "%liхв %liс"
 
 #. s means seconds
 #: apt-pkg/contrib/strutl.cc:391
 #, c-format
 msgid "%lis"
-msgstr "%lis"
+msgstr "%liс"
 
 #: apt-pkg/contrib/strutl.cc:1167
 #, c-format
@@ -2368,47 +2404,51 @@ msgstr "Відкривається конфігураційний файл %s"
 #: apt-pkg/contrib/configuration.cc:773
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Синтаксова помилка  %s:%u: Блок починається без назви."
+msgstr "Синтаксична помилка %s:%u: Блок починається без назви."
 
 #: apt-pkg/contrib/configuration.cc:792
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Синтаксова помилка %s:%u: спотворений тег"
+msgstr "Синтаксична помилка %s:%u: спотворений тег"
 
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Синтаксова помилка %s:%u: зайві символи після величини"
+msgstr "Синтаксична помилка %s:%u: зайві символи після величини"
 
 #: apt-pkg/contrib/configuration.cc:849
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
+"Синтаксична помилка %s:%u: Директиви можуть бути виконані тільки на "
+"найвищому рівні"
 
 #: apt-pkg/contrib/configuration.cc:856
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Синтаксова помилка  %s:%u: Забагато вмонтованих включень"
+msgstr "Синтаксична помилка %s:%u: Забагато вмонтованих (nested) включень"
 
 #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "Синтаксова помилка %s:%u: Включена звідси"
+msgstr "Синтаксична помилка %s:%u: Включено звідси"
 
 #: apt-pkg/contrib/configuration.cc:869
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Синтаксова помилка  %s:%u: Директива '%s' не підтримується"
+msgstr "Синтаксична помилка %s:%u: Директива '%s' не підтримується"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
+"Синтаксична помилка %s:%u: 'clear directive' потребує дерево налаштувань як "
+"аргумент"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла"
+msgstr "Синтаксична помилка %s:%u: Зайве сміття в кінці файла"
 
 #: apt-pkg/contrib/progress.cc:146
 #, c-format
@@ -2423,7 +2463,7 @@ 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:105 apt-pkg/contrib/cmndline.cc:114
 #: apt-pkg/contrib/cmndline.cc:122
@@ -2434,7 +2474,7 @@ msgstr "Незрозумілий параметр %s командного ряд
 #: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option %s is not boolean"
-msgstr "Не логічний параметр %s командного рядка"
+msgstr "Параметр %s командного рядка не є логічного типу 'boolean'"
 
 #: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
 #, c-format
@@ -2445,21 +2485,22 @@ msgstr "Параметр %s потребує аргумента."
 #, 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'"
+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:300
 #, 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:350
 #, c-format
@@ -2478,19 +2519,19 @@ msgstr "Не вдалося прочитати атрибути cdrom"
 #: apt-pkg/contrib/fileutl.cc:93
 #, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Проблема з закриттям gzip файла %s"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "Блокування не використовується, так як файл блокування %s доступний тільки "
-"для читання"
+"для зчитування"
 
 #: apt-pkg/contrib/fileutl.cc:230
 #, c-format
 msgid "Could not open lock file %s"
-msgstr "Не можливо відкрити lock файл %s"
+msgstr "Неможливо відкрити 'lock' файл %s"
 
 #: apt-pkg/contrib/fileutl.cc:248
 #, c-format
@@ -2502,38 +2543,39 @@ msgstr ""
 #: apt-pkg/contrib/fileutl.cc:252
 #, c-format
 msgid "Could not get lock %s"
-msgstr ""
+msgstr "Неможливо отримати замок %s"
 
 #: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
+msgstr "Неможливо створити перелік файлів, так як '%s' не є директорією"
 
 #: apt-pkg/contrib/fileutl.cc:426
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgstr "Ігнорується '%s' у директорії '%s', так як не є звичайним файлом"
 
 #: apt-pkg/contrib/fileutl.cc:444
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+msgstr "Ігнорується файл '%s' у директорії '%s', так як він не має розширення"
 
 #: apt-pkg/contrib/fileutl.cc:453
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
+"Ігнорується файл '%s' у директорії '%s', так як він має невірне розширення"
 
 #: apt-pkg/contrib/fileutl.cc:840
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
-msgstr "Підпроцес %s отримав segmentation fault."
+msgstr "Підпроцес %s отримав 'segmentation fault' (фатальна помилка)."
 
 #: apt-pkg/contrib/fileutl.cc:842
 #, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Підпроцес %s відіслав сигнал %u."
+msgstr "Підпроцес %s отримав сигнал %u."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2548,12 +2590,12 @@ msgstr "Підпроцес %s раптово завершився"
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
 #, c-format
 msgid "Could not open file %s"
-msgstr "Не можливо відкрити файл %s"
+msgstr "Неможливо відкрити файл %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
 #, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Неможливо відкрити файловий дескриптор %d"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2566,27 +2608,27 @@ msgstr "Не вдалося виконати компресор "
 #: apt-pkg/contrib/fileutl.cc:1309
 #, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "зчитування, повинен зчитати ще %llu байт, але нічого більше нема"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
 #, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "записування, повинен був записати ще %llu байт, але не вдалося"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Проблема з закриттям файла %s"
 
 #: apt-pkg/contrib/fileutl.cc:1748
 #, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Проблема з перейменуванням файла %s на %s"
 
 #: apt-pkg/contrib/fileutl.cc:1759
 #, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Проблема з роз'єднанням файла %s"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2606,12 +2648,12 @@ msgstr "Файл кешу пакунків має несумісну версі�
 
 #: apt-pkg/pkgcache.cc:162
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Файл кешу пакунків пошкоджений, занадто малий"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr "APT не підтримує систему призначення версій '%s'"
+msgstr "Цей APT не підтримує систему призначення версій '%s'"
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
@@ -2631,11 +2673,11 @@ msgstr "Пропонує (Suggests)"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Recommends"
-msgstr "Рекомендує"
+msgstr "Рекомендує (Recommends)"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Conflicts"
-msgstr "Конфлікти"
+msgstr "Конфлікти (Conflicts)"
 
 #: apt-pkg/pkgcache.cc:306
 msgid "Replaces"
@@ -2647,31 +2689,31 @@ msgstr "Застарілі (Obsoletes)"
 
 #: apt-pkg/pkgcache.cc:307
 msgid "Breaks"
-msgstr "Недієздатні"
+msgstr "Ламає (Breaks)"
 
 #: apt-pkg/pkgcache.cc:307
 msgid "Enhances"
-msgstr "Підсилює"
+msgstr "Покращує (Enhances)"
 
 #: apt-pkg/pkgcache.cc:318
 msgid "important"
-msgstr "Важливі (Important)"
+msgstr "важливі (important)"
 
 #: apt-pkg/pkgcache.cc:318
 msgid "required"
-msgstr "Необхідні (Required)"
+msgstr "необхідні (required)"
 
 #: apt-pkg/pkgcache.cc:318
 msgid "standard"
-msgstr "Стандартні (Standard)"
+msgstr "стандартні (standard)"
 
 #: apt-pkg/pkgcache.cc:319
 msgid "optional"
-msgstr "Необов'язкові (Optional)"
+msgstr "необов'язкові (optional)"
 
 #: apt-pkg/pkgcache.cc:319
 msgid "extra"
-msgstr "Додаткові (Extra)"
+msgstr "додаткові (extra)"
 
 #: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
@@ -2687,78 +2729,79 @@ msgstr "Ґенерація залежностей"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
-msgstr "Читання інформації про стан"
+msgstr "Зчитування інформації про стан"
 
 #: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "Не вдалося відкрити StateFile %s"
 
 #: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "Не вдалося записати до тимчасового StateFile файла %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
 msgid "Unable to parse package file %s (1)"
-msgstr "Неможливо обробити файл %s пакунку (1)"
+msgstr "Неможливо проаналізувати файл пакунку %s (1)"
 
 #: apt-pkg/tagfile.cc:216
 #, c-format
 msgid "Unable to parse package file %s (2)"
-msgstr "Неможливо обробити файл %s пакунку (2)"
+msgstr "Неможливо проаналізувати файл пакунку %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "Спотворений рядок %lu у переліку джерел %s (нечитабельний [параметр])"
 
 #: apt-pkg/sourcelist.cc:99
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
+"Спотворений рядок %lu у переліку джерел %s ([параметр] занадто короткий)"
 
 #: apt-pkg/sourcelist.cc:110
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не є призначенням)"
 
 #: apt-pkg/sourcelist.cc:116
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "Спотворений рядок %lu у переліку джерел %s ([%s] не має ключа)"
 
 #: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
+"Спотворений рядок %lu у переліку джерел %s ([%s] ключ %s не має значення)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (проблема з URI)"
 
 #: apt-pkg/sourcelist.cc:134
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-"Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist)"
 
 #: apt-pkg/sourcelist.cc:137
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (аналіз URI)"
 
 #: apt-pkg/sourcelist.cc:143
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (absolute dist)"
 
 #: apt-pkg/sourcelist.cc:150
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)"
+msgstr "Спотворений рядок %lu у переліку джерел %s (dist parse)"
 
 #: apt-pkg/sourcelist.cc:248
 #, c-format
@@ -2768,17 +2811,17 @@ msgstr "Відкриття %s"
 #: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
 #, c-format
 msgid "Line %u too long in source list %s."
-msgstr "Лінія %u занадто довга в переліку джерел %s."
+msgstr "Рядок %u є занадто довгим у переліку джерел %s."
 
 #: apt-pkg/sourcelist.cc:285
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "Спотворена лінія %u у переліку джерел %s (тип)"
+msgstr "Спотворений рядок %u у переліку джерел %s (тип)"
 
 #: apt-pkg/sourcelist.cc:289
 #, 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/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2786,11 +2829,13 @@ msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
+"Неможливо прямо налаштувати конфігурацію на '%s'. Будь-ласка, дивіться man 5 "
+"apt.conf, нижче APT::Immediate-Configure для деталей. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
 #, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Неможливо налаштувати '%s'."
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2800,7 +2845,7 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 "Для виконання даного встановлення потрібне тимчасове видалення важливого "
-"пакету %s через конфлікти/петлеві пре-залежності (Pre-Depends loop). Це "
+"пакунку %s через петлеві конфлікти/пре-залежності (Pre-Depends loop). Це "
 "погано, але якщо Ви дійсно бажаєте зробити це, активуйте параметр APT::Force-"
 "LoopBreak."
 
@@ -2814,8 +2859,7 @@ msgstr "Тип '%s' індексного файлу не підтримуєть�
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"Пакунок %s повинен бути перевстановленим, але я не можу знайти архіву для "
-"нього."
+"Пакунок %s повинен бути перевстановленим, але я не можу знайти його архів."
 
 #: apt-pkg/algorithms.cc:1223
 msgid ""
@@ -2827,40 +2871,42 @@ msgstr ""
 
 #: apt-pkg/algorithms.cc:1225
 msgid "Unable to correct problems, you have held broken packages."
-msgstr "Неможливо усунути проблеми, Ви маєте поламані зафіксовані пакунки."
+msgstr "Неможливо усунути проблеми, ви маєте поламані зафіксовані пакунки."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Деякі індексні файли не вдалося завантажити. Вони були зігноровані, або "
+"замість них були використані старіші версії."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Відсутня директорія зі списками: %spartial"
 
 #: apt-pkg/acquire.cc:85
 #, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Відсутня директорія для архівів: %spartial"
 
 #: apt-pkg/acquire.cc:93
 #, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Неможливо заблокувати директорію %s"
 
 #. only show the ETA if it makes sense
 #. two days
 #: apt-pkg/acquire.cc:893
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Вилучення файлів %li з %li (%s залишилося)"
+msgstr "Завантажується файл %li з %li (залишилось %s)"
 
 #: apt-pkg/acquire.cc:895
 #, c-format
 msgid "Retrieving file %li of %li"
-msgstr "Вилучення файлів %li з %li"
+msgstr "Завантажується файл %li з %li"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -2870,13 +2916,13 @@ msgstr "Драйвер для метода %s не знайдено."
 #: apt-pkg/acquire-worker.cc:161
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "Метод %s не стартував коректно"
+msgstr "Метод %s стартував некоректно"
 
 #: apt-pkg/acquire-worker.cc:440
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Будь-ласка, вставте диск з поміткою: '%s' в CD привід '%s' і натисніть Enter."
+"Будь-ласка, вставте диск з поміткою: '%s' в привід '%s' і натисніть Enter."
 
 #: apt-pkg/init.cc:152
 #, c-format
@@ -2894,19 +2940,19 @@ msgstr "Неможливо прочитати атрибути %s."
 
 #: apt-pkg/srcrecords.cc:47
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Ви повинні записати певні 'source' посилання в твій sources.list"
+msgstr "Додайте деякі посилання (URI) на вихідні тексти у ваш sources.list"
 
 #: apt-pkg/cachefile.cc:87
 msgid "The package lists or status file could not be parsed or opened."
-msgstr "Не можу обробити чи відкрити перелік пакунків чи status файл."
+msgstr "Не можу обробити чи відкрити перелік пакунків чи статусний файл."
 
 #: apt-pkg/cachefile.cc:91
 msgid "You may want to run apt-get update to correct these problems"
-msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get"
+msgstr "Для виправлення цих помилок Ви можете виконати apt-get update"
 
 #: apt-pkg/cachefile.cc:109
 msgid "The list of sources could not be read."
-msgstr "Неможливо прочитати перелік джерел."
+msgstr "Неможливо прочитати перелік вихідних кодів."
 
 #: apt-pkg/policy.cc:74
 #, c-format
@@ -2914,20 +2960,22 @@ msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr ""
+"Невірне значення '%s' для APT::Default-Release, так як такий випуск не є "
+"доступним у вихідних кодах"
 
 #: apt-pkg/policy.cc:396
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Невірний запис у файлі налаштувань %s, відсутній заголовок Package"
 
 #: apt-pkg/policy.cc:418
 #, c-format
 msgid "Did not understand pin type %s"
-msgstr "Не зрозумів тип %s для pin"
+msgstr "Не зрозумів тип %s для фіксатора пакунків (pin)"
 
 #: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
-msgstr "Не встановлено пріоритету (або встановлено 0) для pin"
+msgstr "Не встановлено пріоритету (або стоїть 0) для фіксатора пакунків (pin)"
 
 #: apt-pkg/pkgcachegen.cc:85
 msgid "Cache has an incompatible versioning system"
@@ -2945,51 +2993,52 @@ msgstr "Кеш має несумісну систему призначення �
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Виникла помилка під час обробки %s (%s%d)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Ви перевищили кількість імен пакунків, які APT може обробити."
+msgstr "Ого! Ви перевищили кількість імен пакунків, які APT може обробити."
 
 #: apt-pkg/pkgcachegen.cc:237
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Ви перевищили кількість версій, які APT може обробити."
+msgstr "Ого! Ви перевищили кількість версій, які APT може обробити."
 
 #: apt-pkg/pkgcachegen.cc:240
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "Ого! Ви перевищили кількість описів, які APT може обробити."
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Ви перевищили кількість залежностей які APT може обробити."
+msgstr "Ого! Ви перевищили кількість залежностей, які APT може обробити."
 
 #: apt-pkg/pkgcachegen.cc:523
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла"
+msgstr "Пакунок %s %s не був знайдений під час обробки залежностей"
 
 #: apt-pkg/pkgcachegen.cc:1092
 #, c-format
 msgid "Couldn't stat source package list %s"
-msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s"
+msgstr "Не вдалося прочитати атрибути переліку вихідних текстів %s"
 
 #: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
 #: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
 msgid "Reading package lists"
-msgstr "Читання переліків пакунків"
+msgstr "Зчитування переліків пакунків"
 
 #: apt-pkg/pkgcachegen.cc:1197
+#, fuzzy
 msgid "Collecting File Provides"
-msgstr ""
+msgstr "Збирання інформації про 'File Provides'"
 
 #: apt-pkg/pkgcachegen.cc:1389 apt-pkg/pkgcachegen.cc:1396
 msgid "IO Error saving source cache"
-msgstr "Помилка IO під час збереження джерельного кешу"
+msgstr "Помилка IO під час збереження кешу вихідних текстів"
 
 #: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
-msgstr "Не вдалося перейменувати, %s (%s -> %s)."
+msgstr "не вдалося перейменувати, %s (%s -> %s)."
 
 #: apt-pkg/acquire-item.cc:599
 msgid "MD5Sum mismatch"
@@ -2998,7 +3047,7 @@ msgstr "Невідповідність MD5Sum"
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
 msgid "Hash Sum mismatch"
-msgstr "Невідповідність хеш-сум"
+msgstr "Невідповідність хешу MD5Sum"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -3006,16 +3055,17 @@ msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
+"Неможливо знайти очікуваний запис '%s' у 'Release' файлі (Невірний запис у "
+"sources.list, або пошкоджений файл)"
 
 #: apt-pkg/acquire-item.cc:1397
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Неможливо знайти хеш-суму для '%s' у 'Release' файлі"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
-"Це не публічний ключ і доступний тільки для наступних інтендифікаторів:\n"
+msgstr "Відсутній публічний ключ для заданих ідентифікаторів (ID) ключа:\n"
 
 #: apt-pkg/acquire-item.cc:1477
 #, c-format
@@ -3023,11 +3073,13 @@ msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
+"Файл 'Release' для %s застарів (недійсний з %s). Оновлення для цього "
+"репозиторія не будуть застосовані."
 
 #: apt-pkg/acquire-item.cc:1499
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
 
 #: apt-pkg/acquire-item.cc:1532
 #, c-format
@@ -3035,12 +3087,14 @@ msgid ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
+"Виникла помилка під час перевірки підпису. Репозиторій не оновлено, "
+"попередні індексні файли будуть використані. Помилка GPG: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 #: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr "Помилка GPG r: %s: %s"
+msgstr "Помилка GPG: %s: %s"
 
 #: apt-pkg/acquire-item.cc:1646
 #, c-format
@@ -3048,8 +3102,8 @@ 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. Можливо, Ви захочете власноруч "
-"виправити цей пакунок. (due to missing arch)"
+"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
+"власноруч виправити цей пакунок. (через відсутність 'arch')"
 
 #: apt-pkg/acquire-item.cc:1705
 #, c-format
@@ -3057,15 +3111,15 @@ msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package."
 msgstr ""
-"Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч "
-"виправити цей пакунок."
+"Я не зміг знайти файл для пакунку %s. Можливо, це значить, що вам потрібно "
+"власноруч виправити цей пакунок."
 
 #: apt-pkg/acquire-item.cc:1764
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"Індексні файли пакунків пошкоджені. Немає поля Filename для пакунку %s."
+"Індексні файли пакунків пошкоджені. Немає поля 'Filename' для пакунку %s."
 
 #: apt-pkg/acquire-item.cc:1862
 msgid "Size mismatch"
@@ -3074,27 +3128,27 @@ msgstr "Невідповідність розміру"
 #: apt-pkg/indexrecords.cc:64
 #, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Неможливо проаналізувати 'Release' файл %s"
 
 #: apt-pkg/indexrecords.cc:74
 #, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Немає секцій у 'Release' файлі %s"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Немає запису 'Hash' у 'Release' файлі %s"
 
 #: apt-pkg/indexrecords.cc:121
 #, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Невірний запис 'Valid-Until' у 'Release' файлі %s"
 
 #: apt-pkg/indexrecords.cc:140
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Невірний запис 'Date' у 'Release' файлі %s"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3107,8 +3161,8 @@ msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
-"Використовується точка монтування CDROM: %s\n"
-"Монтування CD-ROM\n"
+"Використовується точка монтування CD-ROM: %s\n"
+"Монтується CD-ROM\n"
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
@@ -3121,12 +3175,12 @@ msgstr "Записано мітку: %s\n"
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
 msgid "Unmounting CD-ROM...\n"
-msgstr "Відмонтовування CD-ROM...\n"
+msgstr "Демонтується CD-ROM...\n"
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
-msgstr "Використовується точка монтування CDROM: %s\n"
+msgstr "Використовується точка монтування CD-ROM: %s\n"
 
 #: apt-pkg/cdrom.cc:660
 msgid "Unmounting CD-ROM\n"
@@ -3142,7 +3196,7 @@ msgstr "Монтується CD-ROM...\n"
 
 #: apt-pkg/cdrom.cc:693
 msgid "Scanning disc for index files..\n"
-msgstr "Диск сканується на індексні файли..\n"
+msgstr "Сканується диск на вміст індексних файлів..\n"
 
 #: apt-pkg/cdrom.cc:744
 #, c-format
@@ -3150,19 +3204,21 @@ msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
-"Знайдено %zu індексованих пакунікв, %zu індексованих джерел, %zu індексовано "
-"перекладів та %zu підписів\n"
+"Знайдено %zu індексів пакунків, %zu індексів вихідних текстів, %zu індексів "
+"перекладів і %zu підписів\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
+"Неможливо знайти ніякі файли пакунків, можливо, що це не диск з Debian, або "
+"невірна архітектура?"
 
 #: apt-pkg/cdrom.cc:782
 #, c-format
 msgid "Found label '%s'\n"
-msgstr "Знайдено мітку '%s'\n"
+msgstr "Знайдено мітку: '%s'\n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
@@ -3183,11 +3239,11 @@ msgstr "Копіюються переліки пакунків..."
 
 #: apt-pkg/cdrom.cc:857
 msgid "Writing new source list\n"
-msgstr "Записується новий перелік джерел\n"
+msgstr "Записується новий перелік вихідних текстів\n"
 
 #: apt-pkg/cdrom.cc:865
 msgid "Source list entries for this disc are:\n"
-msgstr "Перелік джерел для цього диску:\n"
+msgstr "Перелік вихідних текстів для цього диска:\n"
 
 #: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
 #, c-format
@@ -3212,28 +3268,28 @@ msgstr "Записано %i записів з %i відсутніми і %i не
 #: apt-pkg/indexcopy.cc:515
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr "Не знайдено запис інтендифікації для: %s"
+msgstr "Неможливо знайти аутентифікаційний запис для: %s"
 
 #: apt-pkg/indexcopy.cc:521
 #, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Хеш не співпадає для : %s"
+msgstr "Невідповідність хешу для: %s"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
 msgid "File %s doesn't start with a clearsigned message"
-msgstr ""
+msgstr "Файл %s починається з не 'clearsigned' повідомленням"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
 #, c-format
 msgid "No keyring installed in %s."
-msgstr "No keyring installed in %s."
+msgstr "Не встановлено 'keyring' у %s."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
 msgid "Release '%s' for '%s' was not found"
-msgstr "Реліз '%s' для '%s' не знайдений"
+msgstr "Випуск '%s' для '%s' не знайдено"
 
 #: apt-pkg/cacheset.cc:406
 #, c-format
@@ -3243,17 +3299,17 @@ msgstr "Версія '%s' для '%s' не знайдена"
 #: apt-pkg/cacheset.cc:517
 #, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Неможливо знайти завдання '%s'"
 
 #: apt-pkg/cacheset.cc:523
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Неможливо знайти ніякий пакунок через рег.вираз '%s'"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "Неможливо вибирати версії пакунку '%s', так як він є чисто віртуальним"
 
 #: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
 #, c-format
@@ -3261,51 +3317,63 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
+"Неможливо вибрати встановлений пакунок, або версію-кандидат пакунку '%s', "
+"так як вони відсутні"
 
 #: apt-pkg/cacheset.cc:555
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
+"Неможливо вибрати найновішу версію пакунку '%s', так як він є чисто "
+"віртуальним"
 
 #: apt-pkg/cacheset.cc:563
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgstr "Неможливо вибрати версію пакунку %s, так як він не має кандидатів"
 
 #: apt-pkg/cacheset.cc:571
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
+"Неможливо вибрати встановлену версію пакунку %s, так як такий пакунок не "
+"встановлено"
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+#, fuzzy
 msgid "Send scenario to solver"
-msgstr ""
+msgstr "Відправити сценарій розв'язувачу"
 
 #: apt-pkg/edsp.cc:209
+#, fuzzy
 msgid "Send request to solver"
-msgstr ""
+msgstr "Відправити запит розв'язувачу"
 
 #: apt-pkg/edsp.cc:277
+#, fuzzy
 msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Пригодуватися до отримання розв'язку"
 
 #: apt-pkg/edsp.cc:284
 msgid "External solver failed without a proper error message"
 msgstr ""
+"Зовнішній розв'язувач завершився невдало без відповідного повідомлення про "
+"помилку"
 
 #: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
+#, fuzzy
 msgid "Execute external solver"
-msgstr ""
+msgstr "Виконати зовнішній розв'язувач"
 
 #: apt-pkg/deb/dpkgpm.cc:72
 #, c-format
 msgid "Installing %s"
-msgstr "Встановлення %s"
+msgstr "Встановлюється %s"
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
 #, c-format
 msgid "Configuring %s"
-msgstr "Конфігурація %s"
+msgstr "Налаштовується %s"
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
 #, c-format
@@ -3315,17 +3383,17 @@ msgstr "Видаляється %s"
 #: apt-pkg/deb/dpkgpm.cc:75
 #, c-format
 msgid "Completely removing %s"
-msgstr "Повне видалення %s"
+msgstr "Повністю видаляється %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Взято до відома зникнення %s"
 
 #: apt-pkg/deb/dpkgpm.cc:77
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr "Запуск після-інсталяційного тригера %s"
+msgstr "Виконується післяустановочний ініціатор %s"
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
@@ -3385,38 +3453,46 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:1238
 msgid "Running dpkg"
-msgstr "Завантаження dpkg"
+msgstr "Виконується dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1410
 msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "Операцію було перервано до того, як вона мала завершитися"
 
 #: apt-pkg/deb/dpkgpm.cc:1472
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
+"Звіт apport не був записаний, тому що параметр MaxReports вже досягнув "
+"максимальної величини"
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1477
 msgid "dependency problems - leaving unconfigured"
-msgstr "проблеми з залежностями - залишається неналаштованим"
+msgstr "проблеми з залежностями - залишено неналаштованим"
 
 #: apt-pkg/deb/dpkgpm.cc:1479
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на те, "
+"що ця помилка є наслідком попередньої невдачі."
 
 #: apt-pkg/deb/dpkgpm.cc:1485
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"відсутність вільного місця на диску"
 
 #: apt-pkg/deb/dpkgpm.cc:1492
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"відсутність вільного місця у пам'яті"
 
 #: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
 msgid ""
@@ -3428,6 +3504,8 @@ msgstr ""
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
+"Звіт apport не був записаний, тому що повідомлення про помилку вказує на "
+"помилку В/В (I/O) у dpkg"
 
 #: apt-pkg/deb/debsystem.cc:84
 #, c-format
@@ -3435,12 +3513,13 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
+"Неможливо заблокувати адміністративну директорію (%s), може її використовує "
+"інший процес?"
 
 #: apt-pkg/deb/debsystem.cc:87
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
-"Неможливо переглянути теку адміністратора (%s), ви супер-користувач (root)?"
+msgstr "Неможливо заблокувати адміністративну директорію (%s), ви root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3449,162 +3528,202 @@ msgstr ""
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
+"dpkg було перервано, ви повинні вручну запустити '%s' аби виправити "
+"проблему. "
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Не заблоковано"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Отримано одну заголовкову лінію понад %u символів"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Пропускається неіснуючий файл %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Помилка читання з процесу %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Не вдалося видалити %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Неможливо відкрити канал (pipe) для %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Неможливо створити %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Не вдалося знайти правильний контрольний (control) файл"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Не вдалося прочитати атрибути %sinfo"
+
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "Директорії info і temp повинні бути на тій самій файловій системі"
+
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Не вдалося переміститися до директорії адміністратора %sinfo"
+
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Внутрішня помилка при отриманні назви пакунку"
+
+#~ msgid "Reading file listing"
+#~ msgstr "Зчитування переліку файлів"
+
+#~ 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 ""
+#~ "Не вдалося відкрити list файл '%sinfo/%s'. Якщо Ви не можете відновити "
+#~ "цей файл, тоді зробіть його пустим і негайно реінсталюйте ту ж саму "
+#~ "версію пакунка!"
+
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Невдача зчитування 'list' файла %sinfo/%s"
+
+#, fuzzy
+#~ msgid "Internal error getting a node"
+#~ msgstr "Внутрішня помилка при отриманні 'node'"
+
+#, fuzzy
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Не вдалося відкрити 'diversions' файл %sdiversions"
+
+#, fuzzy
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Файл з 'diversions' пошкоджений"
+
+#, fuzzy
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Невірний рядок у 'diversion' файлі: %s"
+
+#, fuzzy
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Внутрішня помилка при додаванні diversion"
+
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Кеш пакунків повинен бути ініційованим першим"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Не вдалося знайти Пакунок: заголовок, зсув %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Погана секція ConfFile у статусному файлі. Зсув %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Помилка обробки MD5. Зсув %lu"
 
 #~ msgid "Couldn't change to %s"
 #~ msgstr "Неможливо змінити %s"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Невдача читання list файла %sinfo/%s"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Не вдалося знайти правильний контрольний (control) файл"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Читання переліку файлів"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Неможливо відкрити канал (pipe) для %s"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Внутрішня помилка отримання назви пакунку"
+#~ msgid "Read error from %s process"
+#~ msgstr "Помилка зчитування з процесу %s"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Не вдалося прочитати атрибути %sinfo"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Отримано один рядок заголовків понад %u символів"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Неможливо створити %s"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #1"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Невдача видалення %s"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #2"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Внутрішня помилка при отриманні вузла"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Спотворений запис про перепризначення (override) %s на рядку %lu #3"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Пакунок %s не встановлений, тому не може бути вилучений\n"
+#~ msgid "decompressor"
+#~ msgstr "декомпресор"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Примітка: Ця дія виконується автоматичною та для потреб dpkg."
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "зчитування, мало прочитати ще %lu байт, але нічого більше нема"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Використовуйте 'apt-get autoremove' щоб вилучити їх."
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "запис, мало записати ще %lu байт, але не змогло"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Використання: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver — інтерфейс для використання поточного\n"
-#~ "розв’язувача як зовнішнього розв’язувача для родини APT для пошуку\n"
-#~ "помилок чи чогось подібного\n"
-#~ "\n"
-#~ "Параметри:\n"
-#~ "  -h  ця довідка.\n"
-#~ "  -q  журнальний вивід - без індикатора стану\n"
-#~ "  -c=? прочитати цей файл з налаштуваннями\n"
-#~ "  -o=? встановити довільні налаштування напр. -o dir::cache=/tmp\n"
-#~ "Дивіться apt.conf(5) сторінки допомоги для детальнішої інформації\n"
-#~ "і більшої кількості параметрів.\n"
-#~ "                       Цей APT має Super Cow Powers.\n"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Сталася помилка під час обробки %s (NewPackage)"
 
-#~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Сталася помилка під час обробки %s (UsePackage1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Сталася помилка під час обробки %s (NewFileDesc1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Сталася помилка під час обробки %s (UsePackage2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Сталася помилка під час обробки %s (NewFileVer1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Сталася помилка під час обробки %s (NewVersion%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Сталася помилка під час обробки %s (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Сталася помилка під час обробки %s (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Сталася помилка під час обробки %s (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Сталася помилка під час обробки %s (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Внутрішня помилка, не можу знайти member"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 #~ msgstr ""
-#~ "Використання: apt-mark [параметри] {auto|manual} пакунок1 [пакунок2 …]\n"
-#~ "\n"
-#~ "apt-mark це простий інтерфейс командного рядка для маркування пакунків\n"
-#~ "як таких, що були встановлені вручну чи автоматично. Він також показує\n"
-#~ "перелік позначок.\n"
-#~ "\n"
-#~ "Команди:\n"
-#~ "   auto - маркування заданих пакунків, як встановлених автоматично\n"
-#~ "   manual - маркування заданих пакунків, як встановлених вручну\n"
-#~ "\n"
-#~ "Параметри:\n"
-#~ "  -h - ця довідка\n"
-#~ "  -q - журнальний вивід - без індикатора стану\n"
-#~ "  -qq - не виключати помилки з вихідного журналу\n"
-#~ "  -s - без дій. Виконати симуляцію дій\n"
-#~ "  -f  читання/запис позначок про автоматичне/ручне встановлення вказаних "
-#~ "пакунків\n"
-#~ "  -c=? прочитати цей файл з налаштуваннями\n"
-#~ "  -o=? встановити довільні налаштування напр. -o dir::cache=/tmp\n"
-#~ "Дивіться apt-get (8) і apt.conf(5) сторінки допомоги для детальнішої "
-#~ "інформації."
+#~ "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна."
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "Теки info і temp повинні бути у тій самій файловій системі"
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Сталася помилка під час обробки %s (NewVersion2)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Неможливо перейти до теки адміністратора %sinfo"
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Спотворений рядок %u у переліку джерел %s (vendor id)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Неможливо отримати доступ до набору ключів (keyring): '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Неможливо накласти латку на файл"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Обробляються ініціатори для %s"
 
 #~ 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!"
+#~ "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 ""
-#~ "Не вдалося відкрити list файл '%sinfo/%s'. Якщо Ви не можете відновити "
-#~ "цей файл, тоді зробіть його пустим і негайно перевстановіть ту ж саму "
-#~ "версію пакунка!"
-
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Помилка аналізу MD5. Зсув %lu"
+#~ "Так як Ви просили виконати тільки одну операцію, те найімовірніше, що\n"
+#~ "пакунок просто не може бути встановлений через помилки в самому пакунку.\n"
+#~ "Необхідно відіслати звіт про цю помилку."
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Поганий розділ ConfFile у файлі стану. Зсув %lu"
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Рядок %d є занадто довгим (максимум %lu)"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "Не вдалося знайти Пакунок: заголовок, зсув %lu"
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Рядок %d є занадто довгим (максимум %d)"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Кеш пакунків повинен бути ініціалізований першим"
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Сталася помилка під час обробки %s (NewFileDesc1)"
 
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Внутрішня помилка додавання перенаправлення"
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Сталася помилка під час обробки %s (NewFileDesc2)"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Недійсний рядок в файлі перенаправлення: %s"
+#~ msgid "Stored label: %s \n"
+#~ msgstr "Записано мітку: %s \n"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Файл перенаправлення пошкоджений"
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "Знайдено %i індексів пакунків, %i індексів вихідних текстів, %i індексів "
+#~ "перекладів і %i підписів\n"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Не вдалося відкрити файл перенаправлення %sdiversions"
+#~ msgid "openpty failed\n"
+#~ msgstr "openpty не вдався\n"
diff --git a/po/vi.po b/po/vi.po
index b3f5f59f8..091d70f54 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:20+0000\n"
+"PO-Revision-Date: 2010-09-29 21:36+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "Language: vi\n"
@@ -15,13 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Gói %s phiên bản %s có phần phụ thuộc chưa thoả mãn:\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:286
 msgid "Total package names: "
@@ -33,11 +32,11 @@ msgstr "Tổng các cấu trúc gói: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  Gói thông thường: "
+msgstr "  Gói chuẩn: "
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  Gói ảo thuần túy: "
+msgstr "  Gói ảo nguyên chất: "
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
@@ -61,19 +60,19 @@ msgstr "Tổng mô tả riêng: "
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "Tổng số phụ thuộc: "
+msgstr "Tổng đồ phụ thuộc: "
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "Tổng liên hệ phiên bản và tập tin: "
+msgstr "Tổng liên quan phiên bản và tập tin: "
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
-msgstr "Tổng liên hệ mô tả/tập tin: "
+msgstr "Tổng liên quan mô tả/tập tin: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "Tổng ánh xạ cung cấp: "
+msgstr "Tổng ảnh xạ Miễn là: "
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
@@ -85,7 +84,7 @@ msgstr "Tổng chỗ phiên bản phụ thuộc: "
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Tổng dung lượng thất thoát: "
+msgstr "Tổng chỗ nghỉ: "
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -94,13 +93,13 @@ msgstr "Tổng chỗ đã tính: "
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "Tập tin gói %s không được đồng bộ."
+msgstr "Tập tin gói %s không đồng bộ được."
 
 #: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
 #: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
-msgstr "Không tìm thấy gói nào"
+msgstr "Không tìm thấy gói"
 
 #: cmdline/apt-cache.cc:1222
 msgid "You must give at least one search pattern"
@@ -163,6 +162,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s cho %s được biên dịch trên %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -198,6 +198,49 @@ 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 ""
+"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"
+"   showauto    Hiển thị danh sách các gói được tự động cài đặt\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 GraphViz (_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, xem hai trang « man » (hướng dẫn)\n"
+"\t\t\tapt-cache(8) và apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -210,15 +253,15 @@ msgstr "Hãy nạp đĩa vào ổ và bấm nút Enter"
 #: cmdline/apt-cdrom.cc:129
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Không thể gắn kết '%s' vào '%s'"
+msgstr "Lỗi lắp « %s » trên « %s »"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Hãy lặp lại quá trình này cho các đĩa còn lại trong bộ đĩa của bạn."
+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:46
 msgid "Arguments not in pairs"
-msgstr "Các đối số không đi theo dạng cặp"
+msgstr "Không có các đối số dạng cặp"
 
 #: cmdline/apt-config.cc:87
 msgid ""
@@ -261,65 +304,65 @@ msgstr ""
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
-msgstr "Lỗi biên dịch biểu thức chính quy - %s"
+msgstr "Lỗi biên dich biểu thức chính quy - %s"
 
 #: cmdline/apt-get.cc:260
 msgid "The following packages have unmet dependencies:"
-msgstr "Những gói sau có phần phụ thuộc chưa thỏa mãn:"
+msgstr "Những gói theo đây phụ thuộc vào phần mềm chưa có :"
 
 #: cmdline/apt-get.cc:350
 #, c-format
 msgid "but %s is installed"
-msgstr "nhưng %s đã được cài đặt"
+msgstr "nhưng mà %s đã được cài đặt"
 
 #: cmdline/apt-get.cc:352
 #, c-format
 msgid "but %s is to be installed"
-msgstr "nhưng %s sẽ được cài đặt"
+msgstr "nhưng mà %s sẽ được cài đặt"
 
 #: cmdline/apt-get.cc:359
 msgid "but it is not installable"
-msgstr "nhưng nó không thể cài được"
+msgstr "nhưng mà nó không có khả năng cài đặt"
 
 #: cmdline/apt-get.cc:361
 msgid "but it is a virtual package"
-msgstr "nhưng nó là một gói ảo"
+msgstr "nhưng mà nó là gói ảo"
 
 #: cmdline/apt-get.cc:364
 msgid "but it is not installed"
-msgstr "nhưng nó chưa được cài đặt"
+msgstr "nhưng mà nó chưa được cài đặt"
 
 #: cmdline/apt-get.cc:364
 msgid "but it is not going to be installed"
-msgstr "nhưng nó sẽ không được cài đặt"
+msgstr "nhưng mà nó sẽ không được cài đặt"
 
 #: cmdline/apt-get.cc:369
 msgid " or"
-msgstr " hoặc"
+msgstr " hay"
 
 #: cmdline/apt-get.cc:398
 msgid "The following NEW packages will be installed:"
-msgstr "Những gói MỚI sau sẽ được cài đặt:"
+msgstr "Theo đây có những gói MỚI sẽ được cài đặt:"
 
 #: cmdline/apt-get.cc:424
 msgid "The following packages will be REMOVED:"
-msgstr "Những gói sau sẽ được GỠ BỎ :"
+msgstr "Theo đây có những gói sẽ bị GỠ BỎ :"
 
 #: cmdline/apt-get.cc:446
 msgid "The following packages have been kept back:"
-msgstr "Những gói sau đã được giữ lại:"
+msgstr "Theo đây có những gói đã được giữ lại:"
 
 #: cmdline/apt-get.cc:467
 msgid "The following packages will be upgraded:"
-msgstr "Những gói sau sẽ được nâng cấp:"
+msgstr "Theo đây có những gói sẽ được nâng cấp:"
 
 #: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
-msgstr "Những gói sau sẽ được HẠ CẤP:"
+msgstr "Theo đây có những gói sẽ được HẠ CẤP:"
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
-msgstr "Những gói đã bị giữ lại sau sẽ được thay đổi:"
+msgstr "Theo đây có những gói sẽ được thay đổi:"
 
 #: cmdline/apt-get.cc:563
 #, c-format
@@ -331,8 +374,8 @@ 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 : Những gói quan trọng sau sẽ bị gỡ bỏ.\n"
-"Hãy dừng lại trừ khi bạn hiểu rõ mình đang làm gì!"
+"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:602
 #, c-format
@@ -357,22 +400,22 @@ msgstr "%lu cần gỡ bỏ, và %lu chưa được nâng cấp.\n"
 #: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
-msgstr "%lu chưa được cài đặt hay gỡ bỏ toàn bộ.\n"
+msgstr "%lu chưa được cài đặt toàn bộ hay được gỡ bỏ.\n"
 
 #: cmdline/apt-get.cc:635
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Ghi chú: đang chọn '%s' cho tác vụ '%s'\n"
+msgstr "Ghi chú : đang chọn « %s » cho tác vụ « %s »\n"
 
 #: cmdline/apt-get.cc:640
 #, 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"
+msgstr "Ghi chú : đang chọn « %s » cho biểu thức chính quy « %s »\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "Gói %s là gói ảo được cung cấp bởi:\n"
+msgstr "Gói %s là gói ảo được cung cấp do :\n"
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
@@ -393,59 +436,60 @@ msgid ""
 "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 tồn tại. Nhưng một gói khác có tham\n"
-"chiếu đến nó. Có thể gói này còn thiếu, đã không còn được\n"
-"sử dụng, hoặc chỉ có thể được lấy từ nguồn khác.\n"
+"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:700
 msgid "However the following packages replace it:"
-msgstr "Tuy nhiên, những gói dưới đây thay thế nó:"
+msgstr "Tuy nhiên, những gói theo đây thay thế nó :"
 
 #: cmdline/apt-get.cc:712
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Gói '%s' không có ứng cử cài đặt"
+msgstr "Gói « %s » không có ứng cử cài đặt"
 
 #: cmdline/apt-get.cc:725
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Không thể gỡ bỏ được gói ảo như '%s'\n"
+msgstr "Không thể gỡ bỏ được gói ảo như « %s »\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Chưa cài đặt gói %s nên không thể gỡ bỏ nó\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Ghi chú: đang chọn '%s' thay cho '%s'\n"
+msgstr "Ghi chú : đang chọn « %s » thay cho « %s »\n"
 
 #: cmdline/apt-get.cc:818
 #, 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"
+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:822
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Đang bỏ qua %s vì nó chưa được cài đặt và chỉ yêu cầu nâng cấp.\n"
+msgstr ""
+"Đang bỏ qua %s vì nó không phải được cài đặt và chỉ yêu cầu Nâng cấp.\n"
 
 #: cmdline/apt-get.cc:834
 #, 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 gói này về.\n"
+msgstr "Không thể cài đặt lại %s vì không thể tải về nó.\n"
 
 #: cmdline/apt-get.cc:839
 #, c-format
 msgid "%s is already the newest version.\n"
-msgstr "%s hiện đang là phiên bản mới nhất.\n"
+msgstr "%s là phiên bản mơi nhất.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
 #, c-format
@@ -455,12 +499,12 @@ msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 #: cmdline/apt-get.cc:884
 #, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Đã chọn phiên bản '%s' (%s) cho '%s'\n"
+msgstr "Đã chọn phiên bản « %s » (%s) cho « %s »\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Đã chọn phiên bản '%s' (%s) cho '%s' vì '%s'\n"
+msgstr "Đã chọn phiên bản « %s » (%s) cho « %s »\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -472,7 +516,7 @@ msgstr " bị lỗi."
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
-msgstr "Không thể sửa các gói phụ thuộc"
+msgstr "Không thể sửa cách phụ thuộc"
 
 #: cmdline/apt-get.cc:1034
 msgid "Unable to minimize the upgrade set"
@@ -484,19 +528,21 @@ msgstr " Hoàn tất"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Bạn nên chạy lệnh 'apt-get -f install' để sửa những lỗi trên."
+msgstr "Có lẽ bạn hãy chay lệnh « apt-get -f install » để sửa hết."
 
 #: cmdline/apt-get.cc:1043
 msgid "Unmet dependencies. Try using -f."
-msgstr "Các gói phụ thuộc không thỏa mãn. Bạn hãy thử dùng tùy chọn -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:1068
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "CẢNH BÁO: Không thể xác thực những gói dưới đây!"
+msgstr "CẢNH BÁO : không thể xác thực những gói theo đây."
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
-msgstr "Cảnh báo xác thực bị ghi đè.\n"
+msgstr "Cảnh báo xác thực bị đè.\n"
 
 #: cmdline/apt-get.cc:1079
 msgid "Install these packages without verification [y/N]? "
@@ -508,11 +554,11 @@ msgstr "Một số gói không thể được xác thực"
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 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'"
+msgstr "Gập lỗi và đã dùng tùy chọn « -y » mà không có  « --force-yes »"
 
 #: cmdline/apt-get.cc:1131
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Lỗi nội bộ: InstallPackages được gọi với gói bị hỏng."
+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:1140
 msgid "Packages need to be removed but remove is disabled."
@@ -525,47 +571,46 @@ msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong"
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
-"Thật lạ là những kích cỡ này không khớp nhau. Hãy gửi thư thông báo cho "
-"<apt@packages.debian.org>"
+"Lạ... Hai kích cỡ không khớp được. Hãy gởi thư cho <apt@packages.debian.org>"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1196
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Cần phải lấy %sB/%sB dữ liệu gói.\n"
+msgstr "Cần phải lấy %sB/%sB kho.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1201
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "Cần phải lấy %sB dữ liệu gói.\n"
+msgstr "Cần phải lấy %sB kho.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1208
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Sau thao tác này, dung lượng trống của ổ đĩa sẽ giảm %sB.\n"
+msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:1213
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Sau thao tác này, %sB dung lượng đĩa sẽ được giải phóng.\n"
+msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
 #, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Không thể xác định chỗ trống trong %s"
+msgstr "Không thể quyết định chỗ rảnh trong %s"
 
 #: cmdline/apt-get.cc:1241
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "Bạn không còn đủ chỗ trống trong %s."
+msgstr "Bạn chưa có đủ sức chức còn rảnh trong %s."
 
 #: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
 msgid "Trivial Only specified but this is not a trivial operation."
@@ -583,9 +628,9 @@ msgid ""
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"Hành động này có thể gây nguy hại.\n"
-"Để tiếp tục, hãy gõ cụm từ '%s'\n"
-" ?] "
+"Bạn sắp làm gì có thể làm hại.\n"
+"Để tiếp tục thì gõ cụm từ « %s »\n"
+"?]"
 
 #: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
 msgid "Abort."
@@ -598,7 +643,7 @@ msgstr "Bạn có muốn tiếp tục không? [C/k] "
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "Không thể lấy %s %s\n"
+msgstr "Việc lấy %s bị lỗi  %s\n"
 
 #: cmdline/apt-get.cc:1372
 msgid "Some files failed to download"
@@ -613,12 +658,14 @@ 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ố gói, bạn hãy thử chạy 'apt-get update' hay '--fix-"
-"missing' xem?"
+"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:1383
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Chưa hỗ trợ tùy chọn '--fix-missing' và tráo đổi phương tiện chứa."
+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:1388
 msgid "Unable to correct missing packages."
@@ -626,7 +673,7 @@ msgstr "Không thể sửa những gói còn thiếu."
 
 #: cmdline/apt-get.cc:1389
 msgid "Aborting install."
-msgstr "Đang hủy cài đặt."
+msgstr "Đang hủy bỏ tiến trình cài đặt."
 
 #: cmdline/apt-get.cc:1417
 msgid ""
@@ -646,34 +693,34 @@ msgstr "Ghi chú : thay đổi này được tự động làm bởi dpkg."
 #: cmdline/apt-get.cc:1559
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Đang bỏ qua bản phát hành '%s' không tồn tại của gói '%s'"
+msgstr "Bỏ qua bản phát hành đích không sẵn sàng « %s » của gói « %s »"
 
 #: cmdline/apt-get.cc:1591
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Đang chọn '%s' làm gói nguồn, thay cho '%s'\n"
+msgstr "Đang chọn « %s » làm gói nguồn, thay cho « %s »\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Bỏ qua phiên bản '%s' không tồn tại của gói '%s'"
+msgstr "Bỏ qua phiên bản không sẵn sàng « %s » của gói « %s »"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
-msgstr "Lệnh 'update' không chấp nhận đối số"
+msgstr "Lệnh cập nhật không chấp nhận đối số"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Không được phép xoá nên không thể khởi chạy AutoRemover"
+msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động"
 
 #: cmdline/apt-get.cc:1815
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
-"Ừm, có vẻ là AutoRemover đã hủy cái gì, một trường hợp thực sự không nên xảy "
-"ra. Hãy thông báo lỗi về apt."
+"Ừm, có vẻ là Bộ Gỡ bỏ Tự động đã hủy cái gì, một trường hợp thực sự không "
+"nên xảy ra. Hãy thông báo lỗi về apt."
 
 #.
 #. if (Packages == 1)
@@ -687,11 +734,11 @@ msgstr ""
 #.
 #: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
 msgid "The following information may help to resolve the situation:"
-msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ giải quyết trường hợp này:"
+msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:"
 
 #: cmdline/apt-get.cc:1822
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Lỗi nội bộ: AutoRemover đã làm hư hại hệ thống."
+msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì."
 
 #: cmdline/apt-get.cc:1829
 msgid ""
@@ -699,35 +746,37 @@ msgid ""
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] "Các gói sau đây đã được tự động cài đặt và không còn cần thiết nữa:"
+msgstr[0] ""
+"Gói nào theo đây đã được tự động cài đặt nên không còn cần thiết lại:"
 
 #: cmdline/apt-get.cc:1833
 #, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu gói đã được cài đặt tự động và không còn cần thiết nữa.\n"
+msgstr[0] "%lu gói đã được tự động cài đặt nên không còn cần thiết lại.\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng."
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Lỗi nội bộ: AllUpgrade đã làm hư hại hệ thống"
+msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì"
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Bạn nên chạy lệnh 'apt-get -f install' để sữa những lỗi này:"
+msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:"
 
 #: cmdline/apt-get.cc:1957
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Gói phụ thuộc không thỏa mãn. Bạn hãy thử chạy lệnh 'apt-get -f install'."
+"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:1972
 msgid ""
@@ -736,18 +785,18 @@ msgid ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"Một số gói không thể được cài đặt. Có thể là do bạn yêu cầu\n"
-"một đòi hỏi không thể giải quyết được hoặc do bạn đang dùng\n"
-"một bản phân phối không ổn định nên một số gói chưa được\n"
-"tạo ra hoặc đã bị loại bỏ."
+"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:1993
 msgid "Broken packages"
-msgstr "Các gói hỏng"
+msgstr "Gói bị hỏng"
 
 #: cmdline/apt-get.cc:2019
 msgid "The following extra packages will be installed:"
-msgstr "Những gói thêm sau đây sẽ được cài đặt:"
+msgstr "Những gói thêm theo đây sẽ được cài đặt:"
 
 #: cmdline/apt-get.cc:2109
 msgid "Suggested packages:"
@@ -777,7 +826,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "Đang tính toán nâng cấp... "
+msgstr "Đang tính bước nâng cấp... "
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -789,11 +838,11 @@ msgstr "Hoàn tất"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Lỗi nội bộ: problem resolver đã làm hư hại hệ thống"
+msgstr "Lỗi nội bộ : bộ tháo gỡ vấn đề đã ngắt gì"
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
-msgstr "Không thể khóa thư mục tải xuống"
+msgstr "Không thể khoá thư mục tải về"
 
 #: cmdline/apt-get.cc:2386
 #, c-format
@@ -807,12 +856,12 @@ msgstr "Đang tải về %s %s"
 
 #: cmdline/apt-get.cc:2451
 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 mã nguồn"
+msgstr "Phải ghi rõ ít nhất một gói cho đó cần lấy mã nguồn"
 
 #: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803
 #, c-format
 msgid "Unable to find a source package for %s"
-msgstr "Không tìm thấy gói mã nguồn cho %s"
+msgstr "Không tìm thấy gói nguồn cho %s"
 
 #: cmdline/apt-get.cc:2508
 #, c-format
@@ -820,41 +869,44 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"GHI CHÚ: Việc đóng gói '%s' được bảo trì trong hệ thống quản lý phiên bản "
-"'%s' tại:\n"
+"GHI CHÚ : sự đóng gói « %s » được bảo tồn trong hệ thống điều khiển phiên "
+"bản « %s » tại:\n"
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Hãy sử dụng câu lệnh:\n"
+"bzr get %s\n"
+"để lấy các bản cập nhật gói mới nhất (có thể là chưa phát hành).\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr "Đang bỏ qua tập tin đã được tải về '%s'\n"
+msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n"
 
 #: cmdline/apt-get.cc:2603
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "Không đủ chỗ trống trong %s"
+msgstr "Không đủ sức chứa còn rảnh trong %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:2612
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Cần phải lấy %sB/%sB gói mã nguồn.\n"
+msgstr "Cần phải lấy %sB/%sB kho nguồn.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #: cmdline/apt-get.cc:2617
 #, c-format
 msgid "Need to get %sB of source archives.\n"
-msgstr "Cần phải lấy %sB gói mã nguồn.\n"
+msgstr "Cần phải lấy %sB kho nguồn.\n"
 
 #: cmdline/apt-get.cc:2623
 #, c-format
@@ -863,7 +915,7 @@ msgstr "Lấy nguồn %s\n"
 
 #: cmdline/apt-get.cc:2661
 msgid "Failed to fetch some archives."
-msgstr "Không thể lấy một số gói."
+msgstr "Việc lấy một số kho bị lỗi."
 
 #: cmdline/apt-get.cc:2692
 #, c-format
@@ -873,17 +925,17 @@ msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n"
 #: cmdline/apt-get.cc:2704
 #, c-format
 msgid "Unpack command '%s' failed.\n"
-msgstr "Lệnh giải nén '%s' bị lỗi.\n"
+msgstr "Lệnh giải nén « %s » bị lỗi.\n"
 
 #: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Hãy kiểm tra xem gói 'dpkg-dev' đã được cài đặt chưa.\n"
+msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n"
 
 #: cmdline/apt-get.cc:2727
 #, c-format
 msgid "Build command '%s' failed.\n"
-msgstr "Lệnh xây dựng '%s' bị lỗi.\n"
+msgstr "Lệnh xây dụng « %s » bị lỗi.\n"
 
 #: cmdline/apt-get.cc:2747
 msgid "Child process failed"
@@ -892,8 +944,7 @@ msgstr "Tiến trình con bị lỗi"
 #: cmdline/apt-get.cc:2766
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
-"Cần phải ghi rõ ít nhất một gói để kiểm tra phần phụ thuộc khi xây dựng "
-"(builddeps)"
+"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:2791
 #, c-format
@@ -905,72 +956,74 @@ msgstr ""
 #: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
 #, c-format
 msgid "Unable to get build-dependency information for %s"
-msgstr "Không thể lấy không tin phần phụ thuộc khi xây dựng (builddeps) cho %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:2838
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s không phụ thuộc vào gói nào khi xây dụng.\n"
+msgstr "%s không phụ thuộc vào gì khi xây dụng.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+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:3026
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr ""
-"Gói phụ thuộc %s của %s không thể được thỏa mãn vì không thể tìm thấy gói %s"
+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:3049
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"Không thể thỏa mãn gói phụ thuộc %s của %s vì gói %s đã cài đặt quá mới"
+"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:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't 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:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+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:3117
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Không thể thỏa mãn gói phụ thuộc %s của %s: %s"
+msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s."
 
 #: cmdline/apt-get.cc:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Gói phụ thuộc khi xây dựng của %s không thể được thỏa mãn."
+msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s."
 
 #: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
-msgstr "Không thể xử lý các gói phụ thuộc khi xây dựng"
+msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "Danh sách thay đổi cho %s (%s)"
+msgstr "Đang kết nối đến %s (%s)..."
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "Mô-đun đã hỗ trợ :"
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1015,6 +1068,55 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"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 được 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 có dạng libc6 không phải libc6.deb)\n"
+"   remove \t_Gỡ bỏ_ gói\n"
+"   autoremove\t\tTự động gỡ bỏ tất cả các gói không dùng\n"
+"   purge\t\tGỡ bỏ và _tẩy_ gói\n"
+"   source \t\tTải về kho _nguồn_\n"
+"   build-dep \tĐịnh cấu hình _quan hệ 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 các tập tin kho đã tải về (_làm sạch_)\n"
+"   autoclean \tXóa 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ó quan hệ phụ thuộc bị ngắt\n"
+"   markauto    Đánh dấu những gói đưa ra như là « được tự động cài đặt »\n"
+"   unmarkauto    Đánh dấu những gói đưa ra như là « được cài đặt bằng tay »\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 hà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 làm gì\n"
+"  -f  \t\tThử sửa chữa một hệ thống có quan hệ phụ thuộc bị ngắt\n"
+"  -m  \tThử 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\n"
+"  -o=? \tLập tùy chọn cấu hình tùy ý, 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 siêu bò.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1023,14 +1125,14 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
-"GHI CHÚ : đây chỉ là một sự mô phỏng!\n"
+"GHI CHÚ : đây chỉ là một sự mô phỏng !\n"
 "      apt-get yêu cầu quyền người chủ để thực hiện thật.\n"
 "      Cũng ghi nhớ rằng chức năng khoá bị tắt,\n"
 "      thì không nên thấy đây là trường hợp hiện thời thật."
 
 #: cmdline/acqprogress.cc:60
 msgid "Hit "
-msgstr "Hit "
+msgstr "Lần tìm "
 
 #: cmdline/acqprogress.cc:84
 msgid "Get:"
@@ -1038,21 +1140,21 @@ msgstr "Lấy:"
 
 #: cmdline/acqprogress.cc:115
 msgid "Ign "
-msgstr "Ign "
+msgstr "Bỏq "
 
 #: cmdline/acqprogress.cc:119
 msgid "Err "
-msgstr "Err "
+msgstr "Lỗi "
 
 #: cmdline/acqprogress.cc:140
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Đã lấy %sB trong %s (%sB/s)\n"
+msgstr "Mới lấy %sB trong %s (%sB/g).\n"
 
 #: cmdline/acqprogress.cc:230
 #, c-format
 msgid " [Working]"
-msgstr " [Đang hoạt động]"
+msgstr " [Hoạt động]"
 
 #: cmdline/acqprogress.cc:286
 #, c-format
@@ -1062,33 +1164,33 @@ msgid ""
 "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"
+" « %s »\n"
+"vào ổ « %s » và bấm nút Enter\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "không thể đánh dấu %s vì nó chưa được cài đặt.\n"
+msgstr "nhưng mà nó chưa được cài đặt"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s đã được đặt thành 'cài đặt bằng tay' từ trước.\n"
+msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s đã được đặt thành 'cài đặt tự động' từ trước.\n"
+msgstr "%s được lập thành « được tự động cài đặt ».\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s đã được đặt thành 'bị giữ lại' từ trước.\n"
+msgstr "%s là phiên bản mơi nhất.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s đã được đặt thành 'không giữ lại' từ trước.\n"
+msgstr "%s là phiên bản mơi nhất.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1097,14 +1199,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "Đã đợi %s nhưng mà chưa gặp nó"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s đã được đặt thành 'bị giữ lại'.\n"
+msgstr "%s được đặt thành « được cài đặt bằng tay ».\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "Bỏ đánh dấu 'bị giữ lại' cho %s.\n"
+msgstr "Việc mở %s bị lỗi"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1142,8 +1244,8 @@ 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."
+"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:222
 msgid "Wrong CD-ROM"
@@ -1152,8 +1254,7 @@ msgstr "CD không đúng"
 #: methods/cdrom.cc:249
 #, 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ó vẫn đang được sử dụng."
+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:254
 msgid "Disk not found."
@@ -1170,11 +1271,11 @@ msgstr "Việc lấy các thông tin bị lỗi"
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
-msgstr "Không thể đặt thời gian thay đổi"
+msgstr "Việc lập giờ sửa đổi bị lỗi"
 
 #: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
-msgstr "Địa chỉ URI không hợp lệ: URI không thể bắt đầu với '//'"
+msgstr "Địa chỉ 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:173
@@ -1197,12 +1298,12 @@ msgstr "Máy phục vụ đã từ chối kết nối, và nói: %s"
 #: methods/ftp.cc:221
 #, c-format
 msgid "USER failed, server said: %s"
-msgstr "USER không đúng, máy chủ nói rằng: %s"
+msgstr "Lệnh USER (người dùng) đã thất bại: máy phục vụ nói: %s"
 
 #: methods/ftp.cc:228
 #, c-format
 msgid "PASS failed, server said: %s"
-msgstr "PASS không đúng, máy chủ nói rằng: %s"
+msgstr "Lệnh PASS (mật khẩu) đã thất bại: máy phục vụ nói: %s"
 
 #: methods/ftp.cc:248
 msgid ""
@@ -1512,14 +1613,14 @@ msgstr "Không thể chuyển đổi sang %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "Không tìm thấy tập tin nhân bản « %s » "
+msgstr "Không tìm thấy tập tin nhân bản « %s »"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Không tìm thấy tập tin nhân bản « %s »"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1546,7 +1647,7 @@ msgstr ""
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "Không thể tạo ống dẫn IPC đến tiến trình con"
+msgstr "Việc tạo ống IPC đến tiến trình con bị lỗi"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
@@ -1559,35 +1660,34 @@ msgstr "Thiết lập mặc định sai."
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
 #: dselect/install:105 dselect/update:45
 msgid "Press enter to continue."
-msgstr "Bấm phím Enter để tiếp tục."
+msgstr "Bấm phím Enter để tiếp tục lại."
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "Bạn có muốn xóa các tập tin .deb đã tải về từ trước không?"
+msgstr "Bạn có muốn xoá bất kỳ tập tin .deb đã tải về trước không?"
 
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Gặp một số lỗi trong khi giải nén. Những gói đã được cài đặt"
+msgstr "Gập một số lỗi trong khi giải nén. Những gói đã được cài đặt"
 
 #: dselect/install:102
 msgid "will be configured. This may result in duplicate errors"
-msgstr "cũng sẽ được cấu hình. Có lẽ sẽ gây ra lỗi trùng"
+msgstr "sẽ cũng được cấu hình. Có lẽ sẽ gây ra lỗi trùng"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr ""
-"hoặc lỗi do thiếu gói phụ thuộc. Điều này cũng không sao, chỉ những lỗi"
+msgstr "hoặc lỗi do quan hệ phụ thuộc chưa thoả. Trường hợp này vẫn đúng,"
 
 #: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
-"bên trên thông điệp này mới quan trọng. Hãy sửa chữa chúng và chạy lại lệnh "
-"cài đặt"
+"chỉ những lỗi bên trên thông điệp này còn lại quan trọng. Hãy sửa chữa, sau "
+"đó chạy lại lệnh cài đặt (I)."
 
 #: dselect/update:30
 msgid "Merging available information"
-msgstr "Đang hợp nhất các thông tin sẵn có..."
+msgstr "Đang hợp nhất các thông tin sẵn sàng..."
 
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
@@ -1629,7 +1729,7 @@ msgstr "Không thể ghi vào %s"
 
 #: cmdline/apt-extracttemplates.cc:313
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Không thể lấy phiên bản debconf. Bạn đã cài đặt Debconf chưa?"
+msgstr "Không thể lấy phiên bản debconf. Debconf có được cài đặt chưa?"
 
 #: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
@@ -1753,35 +1853,35 @@ msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
-msgstr "Không khớp lựa chọn nào"
+msgstr "Không có điều đã chọn khớp được"
 
 #: ftparchive/apt-ftparchive.cc:880
 #, 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'"
+msgstr "Thiếu một số tập tin trong nhóm tập tin gói « %s »."
 
 #: ftparchive/cachedb.cc:47
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Cơ sở dữ liệu bị hỏng nên tập tin đổi tên thành %s.old"
+msgstr "Cơ sở dữ liệu bị hỏng nên đã đổi tên tâp tin thành %s.old (old: cũ)."
 
 #: ftparchive/cachedb.cc:65
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
-msgstr "Cơ sở dữ liệu đã cũ, đang cố nâng cấp %s"
+msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s"
 
 #: ftparchive/cachedb.cc:76
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Định dạng cơ sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
-"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại cơ sở dữ liệu."
+"Định dạng co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản "
+"apt cũ, hãy gỡ bỏ nó và sau đó tạo lại co sở dữ liệu."
 
 #: ftparchive/cachedb.cc:81
 #, c-format
 msgid "Unable to open DB file %s: %s"
-msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s"
+msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s."
 
 #: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 #: apt-inst/extract.cc:210
@@ -1800,38 +1900,38 @@ msgstr "Không thể lấy con chạy"
 #: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "W: Không thể đọc thư mục %s\n"
+msgstr "CB: Không thể đọc thư mục %s\n"
 
 #: ftparchive/writer.cc:85
 #, 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"
+msgstr "CB: Không thể lấy thông tin toàn bộ cho %s\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "E: "
+msgstr "LỖI: "
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "W: "
+msgstr "CB: "
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "E: Có lỗi áp dụng vào tập tin "
+msgstr "LỖI: có lỗi áp dụng vào tập tin "
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "Không thể giải quyết %s"
+msgstr "Việc quyết định %s bị lỗi"
 
 #: ftparchive/writer.cc:181
 msgid "Tree walking failed"
-msgstr "Tree walking không thành công"
+msgstr "Việc di chuyển qua cây bị lỗi"
 
 #: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
-msgstr "Không thể mở %s"
+msgstr "Việc mở %s bị lỗi"
 
 #: ftparchive/writer.cc:267
 #, c-format
@@ -1851,12 +1951,12 @@ msgstr "Việc bỏ liên kết %s bị lỗi"
 #: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** Không thể liên kết %s đến %s"
+msgstr "*** Việc liên kết %s đến %s bị lỗi"
 
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " Chạm tới giới hạn %sB của việc bỏ liên kết.\n"
+msgstr " Hết hạn bỏ liên kết của %sB.\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -1870,7 +1970,7 @@ msgstr "  %s không có mục ghi đè\n"
 #: ftparchive/writer.cc:477 ftparchive/writer.cc:827
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
-msgstr "  người phụ trách %s là %s chứ không phải %s\n"
+msgstr "  người bảo quản %s là %s không phải %s\n"
 
 #: ftparchive/writer.cc:721
 #, c-format
@@ -1884,7 +1984,7 @@ msgstr "  %s cũng không có mục ghi đè nhị phân\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Không thể cấp phát bộ nhớ"
+msgstr "realloc (cấp phát lại) - việc cấp phát bộ nhớ bị lỗi"
 
 #: ftparchive/override.cc:35 ftparchive/override.cc:143
 #, c-format
@@ -1892,29 +1992,29 @@ msgid "Unable to open %s"
 msgstr "Không thể mở %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Điều đè dạng sai %s dòng %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Điều đè dạng sai %s dòng %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Điều đè dạng sai %s dòng %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "Không thể đọc tập tin ghi đè %s"
+msgstr "Việc đọc tập tin đè %s bị lỗi"
 
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "Thuật toán nén lạ '%s'"
+msgstr "Không biết thuật toán nén « %s »"
 
 #: ftparchive/multicompress.cc:100
 #, c-format
@@ -1923,20 +2023,20 @@ msgstr "Dữ liệu xuất đã nén %s cần một bộ nén"
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
-msgstr "Không thể tạo FILE*"
+msgstr "Việc tạo TẬP_TIN* bị lỗi"
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
-msgstr "Không thể tạo tiến trình con"
+msgstr "Việc tạo tiến trình con bị lỗi"
 
 #: ftparchive/multicompress.cc:206
 msgid "Compress child"
-msgstr "Compress child"
+msgstr "Nén điều con"
 
 #: ftparchive/multicompress.cc:229
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "Lỗi nội bộ, không thể tạo %s"
+msgstr "Lỗi nội bộ, việc tạo %s bị lỗi"
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
@@ -1944,7 +2044,7 @@ msgstr "việc nhập/xuất vào tiến trình con/tập tin bị lỗi"
 
 #: ftparchive/multicompress.cc:342
 msgid "Failed to read while computing MD5"
-msgstr "Không thể đọc trong khi đang tính mã MD5"
+msgstr "Việc đọc khi tính MD5 bị lỗi"
 
 #: ftparchive/multicompress.cc:358
 #, c-format
@@ -1954,9 +2054,10 @@ msgstr "Gặp lỗi khi bỏ liên kết %s"
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "Không thể đổi tên %s thành %s"
+msgstr "Việc đổi tên %s thành %s bị lỗi"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1969,10 +2070,24 @@ msgid ""
 "  -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-sortpkgs.cc:89
 msgid "Unknown package record!"
-msgstr "Hồ sơ gói lạ!"
+msgstr "Không rõ mục ghi gói."
 
 #: cmdline/apt-sortpkgs.cc:153
 msgid ""
@@ -2010,11 +2125,11 @@ msgstr "Việc thực hiện gzip bị lỗi "
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
-msgstr "Gói bị hỏng."
+msgstr "Kho bị hỏng."
 
 #: apt-inst/contrib/extracttar.cc:196
 msgid "Tar checksum failed, archive corrupted"
-msgstr "Tập tin tar bị lỗi checksum, gói bị hỏng"
+msgstr "Lỗi kiểm tổng tar, kho bị hỏng"
 
 #: apt-inst/contrib/extracttar.cc:303
 #, c-format
@@ -2023,7 +2138,7 @@ msgstr "Không rõ kiểu phần đầu tar %u, bộ phạn %s"
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
-msgstr "Chữ ký gói không hợp lệ"
+msgstr "Chữ ký kho không hợp lệ"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
@@ -2052,25 +2167,25 @@ msgstr "DropNode (thả điểm nút) được gọi với điểm nút còn li�
 
 #: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
-msgstr "Không thể định vi phần tử băm!"
+msgstr "Việc định vi phần tử băm bị lỗi"
 
 #: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
-msgstr "Không thể cấp phát chuyển hướng (diversion)"
+msgstr "Việc cấp phát sự trệch đi bị lỗi"
 
 #: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
-msgstr "Lỗi nội bộ trong AddDiversion"
+msgstr "Lỗi nội bộ trong AddDiversion (thêm sự trệch đi)"
 
 #: apt-inst/filelist.cc:479
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Đang cố ghi đè một sự chuyển hướng, %s -> %s và %s/%s"
+msgstr "Đang cố ghi đè một sự trệch đi, %s → %s và %s/%s"
 
 #: apt-inst/filelist.cc:508
 #, c-format
 msgid "Double add of diversion %s -> %s"
-msgstr "Double add of diversion %s -> %s"
+msgstr "Sự trệch đi được thêm hai lần %s → %s"
 
 #: apt-inst/filelist.cc:551
 #, c-format
@@ -2080,12 +2195,12 @@ msgstr "Tập tin cấu hình trùng %s/%s"
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, c-format
 msgid "Failed to write file %s"
-msgstr "Không thể ghi tập tin %s"
+msgstr "Việc ghi tập tin %s bị lỗi"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
-msgstr "Không thể đóng tập tin %s"
+msgstr "Việc đóng tập tin %s bị lỗi"
 
 #: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
@@ -2100,16 +2215,16 @@ 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 đã được chuyển hướng"
+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 "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 chuyển hướng quá dài."
+msgstr "Đường dẫn trệch đi quá dài."
 
 #: apt-inst/extract.cc:243
 #, c-format
@@ -2118,7 +2233,7 @@ msgstr "Thư mục %s đang được thay thế do điều không phải là th�
 
 #: apt-inst/extract.cc:283
 msgid "Failed to locate node in its hash bucket"
-msgstr "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"
@@ -2159,7 +2274,7 @@ msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn %s"
 
 #: apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
-msgstr "Tập tin điều khiển không thể đọc được"
+msgstr "Tập tin điều khiển không có khả năng phân tách"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -2171,9 +2286,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Không thể nhân đôi bộ mô tả tập tin %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %lu byte"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2444,21 +2559,21 @@ msgstr "Không thể mở bộ mô tả tập tin %d"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
-msgstr "Không thể tạo tiến trình con IPC"
+msgstr "Việc tạo tiến trình con IPC bị lỗi"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "Không thể thực thi bộ nén "
+msgstr "Việc thực hiện bô nén bị lỗi "
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "đọc, còn cần đọc %lu nhưng mà không có gì còn lại"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2492,8 +2607,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "Tập tin nhớ tạm gói là một phiên bản không tương thích"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Tập tin nhớ tạm gói bị hỏng"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2686,9 +2802,9 @@ msgstr ""
 "conf  » dưới « APT::Immediate-Configure » để tìm chi tiết. (%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Không thể mở tập tin « %s »"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2726,10 +2842,13 @@ 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/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 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ế."
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2842,9 +2961,9 @@ msgstr "Bộ nhớ tạm có hệ thống điêu khiển phiên bản không tư
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2907,9 +3026,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Không thể phân tích cú pháp của tập tin Phát hành %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3365,52 +3484,37 @@ msgstr "Không thể khoá thư mục quản lý (%s): bạn có quyền ngườ
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
-"dpkg bị gián đoạn, bạn cần phải tự động chạy « %s » để giải vấn đề này. "
+"dpkg bị gián đoạn, bạn cần phải tự động chạy « %s » để giải vấn đề này."
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "Không phải bị khoá"
 
-#~ 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ự"
-
-#~ msgid "Read error from %s process"
-#~ msgstr "Gặp lỗi đọc từ tiến trình %s"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Không thể mở ống dẫn cho %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Việc gỡ bỏ %s bị lỗi"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Không thể chuyển đổi sang %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Không thể tạo %s"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Việc lấy các thông tin về %sinfo bị lỗi"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgid "The info and temp directories need to be on the same filesystem"
 #~ 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"
-
-#~ 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"
-
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "Phải khởi động bộ nhớ tạm gói trước hết"
-
-#~ msgid "Internal error adding a diversion"
-#~ msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi"
-
-#~ 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"
+#~ "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"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Tập tin trệch đi bị hỏng"
+#~ 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"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Gặp lỗi nội bộ khi lấy tên gói"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi"
+#~ msgid "Reading file listing"
+#~ msgstr "Đang đọc danh sách tập tin..."
 
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -3421,51 +3525,118 @@ msgstr "Không phải bị khoá"
 #~ "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."
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Gặp lỗi nội bộ khi lấy tên gói"
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Việc đọc tập tin danh sách %sinfo/%s bị lỗi"
 
-#~ 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"
+#~ msgid "Internal error getting a node"
+#~ msgstr "Gặp lỗi nội bộ khi lấy nút điểm..."
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Việc mở tập tin trệch đi %sdiversions bị lỗi"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Tập tin trệch đi bị hỏng"
+
+#~ 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"
+
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Gặp lỗi nội bộ khi thêm một sự trệch đi"
+
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Phải khởi động bộ nhớ tạm gói trước hết"
+
+#~ 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"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
 #~ 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"
+#~ "Có phần cấu hình tập tin (ConfFile) sai trong tập tin trạng thái. Hiệu số "
+#~ "%lu"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Không thể tạo %s"
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gặp lỗi khi phân tách MD5. Hiệu số %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Không thể chuyển đổi sang %s"
+
+#~ 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"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Không thể mở ống dẫn cho %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Gặp lỗi đọc từ tiến trình %s"
+
+#~ 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ự"
+
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "Ghi chú : thay đổi này được tự động làm bởi dpkg."
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Điều đè dạng sai %s dòng %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Điều đè dạng sai %s dòng %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Điều đè dạng sai %s dòng %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "bộ giải nén"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "đọc, còn cần đọc %lu nhưng mà không có gì còn lại"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "ghi, còn cần ghi %lu nhưng mà không thể"
 
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Dynamic MMap (ảnh xạ bộ nhớ động) đã hết sức chứa.\n"
-#~ "Hãy tăng kích cỡ của « APT::Cache-Limit » (giới hạn vùng nhớ tạm Apt).\n"
-#~ "Giá trị hiện thời:  %lu. (man 5 apt.conf)"
+#~ "Không thể thực hiện ngay lập tức tiến trình cấu hình « %s » đã giải nén. "
+#~ "Xem « man 5 apt.conf  » dưới « APT::Immediate-Configure » để tìm chi tiết."
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewPackage - gói mới)"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Gói %s chưa được cài đặt nên không thể gỡ bỏ\n"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (UsePackage1 - dùng gói 1)"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Ghi chú: Thay đổi này được tự động làm bởi dpkg."
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc1 - tập tin mô tả mới 1)"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Hãy sử dụng lệnh 'apt-get autoremove' để gỡ bỏ chúng."
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (UsePackage2 - dùng gói 2)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Không thể gỡ bỏ %s"
+#~ 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)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Không thể lấy thông tin về %sinfo"
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewVersion%d)"
 
-#~ msgid "Reading file listing"
-#~ msgstr "Đang đọc danh sách tập tin"
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Gặp lỗi khi xử lý %s (UsePackage3)"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "Gặp lỗi nội bộ khi lấy nút điểm"
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Gặp lỗi khi xử lý %s (NewFileDesc2)"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Không thể định vị một tập tin điều khiển hợp lệ nào"
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Gặp lỗi khi xử lý %s (FindPkg - tìm gói)"
+
+#~ 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)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Gặp lỗi nội bộ, không thể định vị bộ phạn"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "Gặp lỗi nội bộ, nhóm « %s » không có gói giả có thể cài đặt"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Tập tin phát hành đã hết hạn nên bỏ qua %s (không hợp lệ kể từ %s)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 28d2b6636..1bc61f15e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-10-12 06:28+0000\n"
+"PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: \n"
@@ -18,8 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -28,71 +26,71 @@ msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "软件包名称总数： "
+msgstr "软件包名称总数："
 
 #: cmdline/apt-cache.cc:288
 msgid "Total package structures: "
-msgstr "全部软件包结构： "
+msgstr "全部软件包结构："
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  普通软件包： "
+msgstr "  普通软件包："
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  完全虚拟软件包： "
+msgstr "  完全虚拟软件包："
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  单虚拟软件包： "
+msgstr "  单虚拟软件包："
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  混合虚拟软件包： "
+msgstr "  混合虚拟软件包："
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  缺失： "
+msgstr "  缺失："
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "按版本共计： "
+msgstr "按版本共计："
 
 #: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
-msgstr "按不同的说明共计： "
+msgstr "按不同的说明共计："
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "按依赖关系共计： "
+msgstr "按依赖关系共计："
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "按版本/文件关系共计： "
+msgstr "按版本/文件关系共计："
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
-msgstr "按说明/文件关系共计： "
+msgstr "按说明/文件关系共计："
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "提供映射共计： "
+msgstr "提供映射共计："
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "Glob 字串共计： "
+msgstr "Glob 字串共计："
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "依赖关系版本名所占空间共计： "
+msgstr "依赖关系版本名所占空间共计："
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Slack 空间共计： "
+msgstr "Slack 空间共计："
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "总占用空间： "
+msgstr "总占用空间："
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -116,7 +114,7 @@ msgstr ""
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "无法定位软件包 %s"
+msgstr "未发现软件包 %s"
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
@@ -137,11 +135,11 @@ msgstr "(没有找到)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  已安装： "
+msgstr "  已安装："
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  候选软件包： "
+msgstr "  候选软件包："
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -149,7 +147,7 @@ msgstr "(无)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  软件包锁： "
+msgstr "  软件包锁："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -165,6 +163,7 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,6 +199,42 @@ 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 文件1 [文件2 ...]\n"
+"　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
+"　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
+"\n"
+"apt-cache 是一个底层的工具，我们用它来操纵 APT 的二进制\n"
+"缓存文件，也用来在那些文件中查询相关信息\n"
+"\n"
+"命令：\n"
+"   add - 向源缓存加入一个软件包文件\n"
+"   gencaches - 同时生成软件包和源代码包的缓存\n"
+"   showpkg - 显示某个软件包的全面信息\n"
+"   showsrc - 显示源文件的各项记录\n"
+"   stats - 显示基本的统计信息\n"
+"   dump - 简要显示整个缓存文件的内容\n"
+"   dumpavail - 把所有有效的包文件列表打印到标准输出\n"
+"   unmet - 显示所有未满足的依赖关系\n"
+"   search - 根据正则表达式搜索软件包列表\n"
+"   show - 以便于阅读的格式介绍该软件包\n"
+"   showauto - 显示自动安装的软件包的列表\n"
+"   depends - 显示该软件包的依赖关系信息\n"
+"   rdepends - 显示所有依赖于该软件包的软件包名字\n"
+"   pkgnames - 列出所有软件包的名字\n"
+"   dotty - 生成可用 GraphViz 处理的软件包关系图\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"
+"若要了解更多信息，您还可以查阅 apt-cache(8) 和 apt.conf(5) 参考手册。\n"
 
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
@@ -337,17 +372,17 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包， "
+msgstr "升级了 %lu 个软件包，新安装了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "重新安装了 %lu 个软件包， "
+msgstr "重新安装了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "降级了 %lu 个软件包， "
+msgstr "降级了 %lu 个软件包，"
 
 #: cmdline/apt-get.cc:610
 #, c-format
@@ -413,14 +448,14 @@ msgstr "类似 %s 的虚拟软件包可以卸载\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "软件包 %s 还未安装，因而不会被卸载\n"
 
 #: cmdline/apt-get.cc:788
 #, c-format
@@ -458,9 +493,9 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -590,7 +625,7 @@ msgstr "中止执行。"
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "您希望继续执行吗？[Y/n] "
+msgstr "您希望继续执行吗？[Y/n]"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -656,7 +691,7 @@ msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
-msgstr "update 命令不需要参数"
+msgstr " update 命令不需要参数"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
@@ -702,10 +737,10 @@ msgid_plural ""
 msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "使用'apt-get autoremove'来卸载它们"
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -815,12 +850,15 @@ msgstr ""
 "%s\n"
 
 #: cmdline/apt-get.cc:2513
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Please use:\n"
 "bzr branch %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:2566
 #, c-format
@@ -898,14 +936,14 @@ msgstr "无法获得 %s 的构建依赖关系信息"
 #: cmdline/apt-get.cc:2838
 #, c-format
 msgid "%s has no build depends.\n"
-msgstr "%s 没有构建依赖关系信息。\n"
+msgstr " %s 没有构建依赖关系信息。\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -920,18 +958,20 @@ 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:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
+"由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 "
+"%1$s 依赖关系"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr ""
+msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -948,15 +988,16 @@ msgid "Failed to process build dependencies"
 msgstr "无法处理构建依赖关系"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "正在连接 %s (%s)"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
 msgstr "支持的模块："
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1001,6 +1042,47 @@ msgid ""
 "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 和 install。\n"
+"\n"
+"命令：\n"
+"   update - 取回更新的软件包列表信息\n"
+"   upgrade - 进行一次升级\n"
+"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
+"   remove - 卸载软件包\n"
+"   autoremove - 卸载所有自动安装且不再使用的软件包\n"
+"   purge - 卸载并清除软件包的配置\n"
+"   source - 下载源码包文件\n"
+"   build-dep - 为源码包配置所需的编译依赖关系\n"
+"   dist-upgrade - 发布版升级，见 apt-get(8)\n"
+"   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
+"   clean - 删除所有已下载的包文件\n"
+"   autoclean - 删除老版本的已下载的包文件\n"
+"   check - 核对以确认系统的依赖关系的完整性\n"
+"   markauto - 标记指定的软件包为自动安装\n"
+"   unmarkauto - 标记指定的软件包为手动安装\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) 和 apt.conf(5)的参考手册\n"
+"以获取更多信息和选项。\n"
+"                       本 APT 具有超级牛力。\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1051,29 +1133,29 @@ msgstr ""
 "的盘片插入驱动器“%s”再按回车键\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "但是它还没有被安装"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "%s 被设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "%s 被设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "%s 已经是最新的版本了。\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "%s 已经是最新的版本了。\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
@@ -1082,14 +1164,14 @@ msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "%s 已设置为手动安装。\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "无法打开 %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1489,14 +1571,14 @@ msgstr "无法切换工作目录到 %s"
 #: methods/mirror.cc:280
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr "没有找到镜像文件 %s "
+msgstr "没有找到镜像文件 %s"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "没有找到镜像文件 %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1523,7 +1605,7 @@ msgstr "无法为子进程创建 IPC 管道"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
-msgstr "连接被过早地关闭了"
+msgstr "连接被永久关闭"
 
 #: dselect/install:32
 msgid "Bad default setting!"
@@ -1758,11 +1840,11 @@ msgstr "警告：无法获得 %s 的状态\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "错误： "
+msgstr "错误："
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "警告： "
+msgstr "警告："
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
@@ -1841,19 +1923,19 @@ msgid "Unable to open %s"
 msgstr "无法打开 %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1906,6 +1988,7 @@ msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1918,6 +2001,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"用法： apt-extracttemplates 文件甲 [文件乙 ...]\n"
+"\n"
+"apt-extracttemplates 是用来从 debian 软件包中解压出配置文件和模板\n"
+"信息的工具\n"
+"\n"
+"选项：\n"
+"  -h   本帮助文本\n"
+"  -t   设置 temp 目录\n"
+"  -c=? 读指定的配置文件\n"
+"  -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -1953,7 +2046,7 @@ msgstr "无法创建管道"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "无法执行 gzip "
+msgstr "无法执行 gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2116,9 +2209,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "无法 mmap %lu 字节的数据"
 
 #: apt-pkg/contrib/mmap.cc:146
 msgid "Unable to close mmap"
@@ -2126,7 +2219,7 @@ msgstr "无法关闭 mmap"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
 msgid "Unable to synchronize mmap"
-msgstr "无法同步 mmap"
+msgstr "无法同步 mmap "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2389,17 +2482,17 @@ msgstr "无法创建子进程的 IPC 管道"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "无法执行压缩程序 "
+msgstr "无法执行压缩程序"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "读取文件出错，还剩 %lu 字节没有读出"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
 #: apt-pkg/contrib/fileutl.cc:1736
 #, c-format
@@ -2433,8 +2526,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "软件包缓存文件损坏了"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2617,9 +2711,9 @@ msgstr ""
 "(%d)"
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "无法打开文件 %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2658,10 +2752,12 @@ msgstr ""
 "系。"
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 #: apt-pkg/acquire.cc:81
 #, c-format
@@ -2683,7 +2779,7 @@ msgstr "无法对目录 %s 加锁"
 #: apt-pkg/acquire.cc:893
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s )"
+msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s 个)"
 
 #: apt-pkg/acquire.cc:895
 #, c-format
@@ -2770,9 +2866,9 @@ msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "处理 %s (FindPkg)时出错"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2835,9 +2931,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "无法解析软件包仓库 Release 文件 %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -3273,59 +3369,35 @@ msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root �
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。 "
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 
 #: apt-pkg/deb/debsystem.cc:121
 msgid "Not locked"
 msgstr "未锁定"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "从 %s 进程读取数据出错"
-
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "无法为 %s 开启管道"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "无法切换工作目录到 %s"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
-
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
-
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "必须首先初始化软件包缓存"
-
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "转移配置文件中有一行是无效的：%s"
-
-#~ msgid "Internal error getting a node"
-#~ msgstr "获得一个节点时出现内部错误"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "无法读取列表文件 %sinfo/%s"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "跳过不存在的文件 %s"
 
-#~ msgid "Reading file listing"
-#~ msgstr "正在读取文件列表"
+#~ msgid "Failed to remove %s"
+#~ msgstr "无法卸载 %s"
 
-#~ msgid "Internal error getting a package name"
-#~ msgstr "在获取软件包名字时出现内部错误"
+#~ msgid "Unable to create %s"
+#~ msgstr "无法创建 %s "
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "无法读取 %sinfo 的状态"
 
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr "info 和 temp 目录要求处于同一文件系统之下"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "无法读取 %sinfo 的状态"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "无法切换工作目录到 admin 目录 %sinfo"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "无法创建 %s"
+#~ msgid "Internal error getting a package name"
+#~ msgstr "在获取软件包名字时出现内部错误"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "软件包 %s 还未安装，因而不会被卸载\n"
+#~ msgid "Reading file listing"
+#~ msgstr "正在读取文件列表"
 
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -3335,39 +3407,201 @@ msgstr "未锁定"
 #~ "无法打开列表文件“%sinfo/%s”。如果您不能恢复这个文件，那么就清空该文件并马"
 #~ "上重新安装相同版本的这个软件包！"
 
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "无法读取列表文件 %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "获得一个节点时出现内部错误"
+
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "无法打开转移配置文件 %sdiversions"
 
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "该转移配置文件被损坏了"
 
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "转移配置文件中有一行是无效的：%s"
+
 #~ msgid "Internal error adding a diversion"
 #~ msgstr "添加转移配置时出现内部错误"
 
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "必须首先初始化软件包缓存"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "无法找到某个软件包：包头，于偏移位置 %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "状态文件中有错误的 ConfFile 段。位于偏移位置 %lu"
+
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "解析 MD5 出错。文件内偏移量为 %lu"
 
+#~ msgid "Couldn't change to %s"
+#~ msgstr "无法切换工作目录到 %s"
+
 #~ msgid "Failed to locate a valid control file"
 #~ msgstr "无法在归档文件中找到有效的主控文件"
 
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "无法为 %s 开启管道"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "从 %s 进程读取数据出错"
+
 #~ msgid "Got a single header line over %u chars"
 #~ msgstr "接收到一行报头行，它的长度超过了 %u 个字符"
 
+#~ msgid "Note: This is done automatic and on purpose by dpkg."
+#~ msgstr "注意：这是自动被 dpkg 有意完成的。"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "override 文件 %s 第 %lu 行的格式有误 #3"
+
+#~ msgid "decompressor"
+#~ msgstr "解压程序"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "读取文件出错，还剩 %lu 字节没有读出"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "写入文件出错，还剩 %lu 字节没有保存"
+
 #~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%lu。(man 5 "
-#~ "apt.conf)"
+#~ "无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::"
+#~ "Immediate-Configure。"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "注意：这是自动被 dpkg 有意完成的。"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "处理 %s (NewPackage)时出错"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "使用'apt-get autoremove'来卸载它们"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "处理 %s (UsePackage1)时出错"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "无法卸载 %s"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "跳过不存在的文件 %s"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "处理 %s (UsePackage2)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "处理 %s (NewFileVer1)时出错"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "处理 %s (NewVersion%d)时出错"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "处理 %s (UsePackage3)时出错"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "处理 %s (FindPkg)时出错"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "处理 %s (CollectFileProvides)时出错"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "内部错误，无法定位包内文件"
+
+#~ msgid "Internal error, group '%s' has no installable pseudo package"
+#~ msgstr "内部错误，组 %s 没有可安装的 pseudo 软件包"
+
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release 文件已过期，忽略 %s (从 %s 起无效)"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "处理 %s (NewVersion2)时出错"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "无法访问密钥环：“%s”"
+
+#~ msgid "Could not patch file"
+#~ msgstr "无法打开补丁文件"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "没有源代码包“%s”，使用“%s”代替\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "启动对 %s 的处理"
+
+#~ msgid "Dynamic MMap ran out of room"
+#~ msgstr "动态内存映射(Dynamic MMap)空间不足"
+
+#~ 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"
+#~ "您最好提交一个针对这个软件包的故障报告。"
+
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "第 %d 行太长了(长度限制为 %lu)。"
+
+#~ msgid "After unpacking %sB of additional disk space will be used.\n"
+#~ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n"
+
+#~ msgid "After unpacking %sB disk space will be freed.\n"
+#~ msgstr "解压缩后将会空出 %sB 的空间。\n"
+
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "第 %d 行太长了(长度限制为 %d)"
+
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "处理 %s (NewFileDesc1)时出错"
+
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "处理 %s (NewFileDesc2)时出错"
+
+#~ msgid "Stored label: %s \n"
+#~ msgstr "归档文件标签：%s \n"
+
+#~ msgid ""
+#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
+#~ "%i signatures\n"
+#~ msgstr ""
+#~ "找到了 %i 个软件包索引、%i 个源代码包索引，%i 个翻译索引和 %i 个数字签名\n"
+
+#~ msgid "openpty failed\n"
+#~ msgstr "openpty 失败\n"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "文件 %s 的时间已被改动"
+
+#~ msgid "Reading file list"
+#~ msgstr "正在读取文件列表"
+
+#~ msgid "Could not execute "
+#~ msgstr "未能执行 "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "正在准备连同配置文件的删除 %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "连同配置文件一同删除 %s "
+
+#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
+#~ msgstr ""
+#~ "在源列表 %3$s 的第 %2$u 行发现了无法识别的软件提供商 ID (vendor ID) “%1$s”"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e7c8089b3..dc63e6a08 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,105 +9,104 @@ msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-08-28 19:43+0000\n"
-"Last-Translator: Tetralet <Unknown>\n"
+"PO-Revision-Date: 2009-01-28 10:41+0800\n"
+"Last-Translator: Tetralet <tetralet@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
 "Language: \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-Launchpad-Export-Date: 2012-10-12 10:32+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
-msgstr "%s 套件 %s 版本未能滿足依存關係：\n"
+msgstr "套件 %s 版本 %s 未能滿足相依性：\n"
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package names: "
-msgstr "套件名稱合計： "
+msgstr "套件名稱合計："
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr "套件結構合計： "
+msgstr "套件名稱合計："
 
 #: cmdline/apt-cache.cc:328
 msgid "  Normal packages: "
-msgstr "  一般套件： "
+msgstr "  一般套件："
 
 #: cmdline/apt-cache.cc:329
 msgid "  Pure virtual packages: "
-msgstr "  完全虛擬套件： "
+msgstr "  完全虛擬套件："
 
 #: cmdline/apt-cache.cc:330
 msgid "  Single virtual packages: "
-msgstr "  單一虛擬套件： "
+msgstr "  單一虛擬套件："
 
 #: cmdline/apt-cache.cc:331
 msgid "  Mixed virtual packages: "
-msgstr "  混合虛擬套件： "
+msgstr "  混合虛擬套件："
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
-msgstr "  欠缺： "
+msgstr "  找不到："
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct versions: "
-msgstr "個別版本合計： "
+msgstr "個別版本合計："
 
 #: cmdline/apt-cache.cc:336
 msgid "Total distinct descriptions: "
-msgstr "個別版本類別合計： "
+msgstr "個別版本類別合計："
 
 #: cmdline/apt-cache.cc:338
 msgid "Total dependencies: "
-msgstr "所有依存關係： "
+msgstr "相依關係合計："
 
 #: cmdline/apt-cache.cc:341
 msgid "Total ver/file relations: "
-msgstr "所有版本/檔案關聯： "
+msgstr "版本/檔案關聯合計："
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Desc/File relations: "
-msgstr "所有描述/檔案關聯合計： "
+msgstr "類別/檔案關聯合計："
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "所有提供套件對應： "
+msgstr "提供者對應合計："
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
-msgstr "所有對應到的字串合計： "
+msgstr "所有字串合計："
 
 #: cmdline/apt-cache.cc:371
 msgid "Total dependency version space: "
-msgstr "依存版本空間合計： "
+msgstr "相依版本空間合計："
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "間暇空間合計： "
+msgstr "間暇空間合計："
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
-msgstr "統計後的空間合計： "
+msgstr "統計後的空間合計："
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
 msgid "Package file %s is out of sync."
-msgstr "%s 套件檔案未同步。"
+msgstr "套件檔 %s 未同步。"
 
 #: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
 #: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
 #: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
 msgid "No packages found"
-msgstr "找不到套件"
+msgstr "未找到套件"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "最少要有一個搜尋式樣"
+msgstr "您必須明確得給定一個樣式"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -116,15 +115,15 @@ msgstr "此指令已不再用。請改用 apt-mark showauto"
 #: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "找不到 %s 套件的位置"
+msgstr "找不到套件 %s"
 
 #: cmdline/apt-cache.cc:1482
 msgid "Package files:"
-msgstr "套件檔案："
+msgstr "套件檔："
 
 #: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "快取資料同步過時，無法 x-ref 套件檔案"
+msgstr "快取資料未同步，無法 x-ref 套件檔"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
@@ -133,15 +132,15 @@ msgstr "鎖定的套件："
 
 #: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
-msgstr "(找不到)"
+msgstr "(未找到)"
 
 #: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
-msgstr "  已安裝： "
+msgstr "  已安裝："
 
 #: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
-msgstr "  候選： "
+msgstr "  候選："
 
 #: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
 msgid "(none)"
@@ -149,7 +148,7 @@ msgstr "(無)"
 
 #: cmdline/apt-cache.cc:1557
 msgid "  Package pin: "
-msgstr "  套件鎖定： "
+msgstr "  套件鎖定："
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
@@ -162,9 +161,10 @@ msgstr "  版本列表："
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s 用於 %s，並於 %s %s 編譯\n"
+msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -200,59 +200,63 @@ 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 [選項] showpkg 套件1 [套件2 ...]\n"
-"       apt-cache [選項] showsrc 套件1 [套件2 ...]\n"
+"用法：apt-cache [選項] 指令\n"
+"      apt-cache [選項] add 檔案1 [檔案2 ...]\n"
+"      apt-cache [選項] showpkg 套件1 [套件2 ...]\n"
+"      apt-cache [選項] showsrc 套件1 [套件2 ...]\n"
 "\n"
-"apt-cache 是從 APT 的二元快取檔案查詢資料的低階工具\n"
+"apt-cache 是一個低階的工具，可用來操作 APT 的二進制快取檔，也可用來\n"
+"查詢那些檔案中的相關訊息\n"
 "\n"
 "指令:\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - 顯示單一套件的一些一般資訊\n"
-"   showsrc - 顯示源碼紀錄\n"
-"   stats - 顯示一些基本統計\n"
-"   dump - 以 terse form 顯示整個檔案\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - 顯示未滿足依存關係\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - 顯示某一套件可讀紀錄\n"
-"   depends - 顯示某一套件原始依存關係資訊\n"
-"   rdepends - 顯示某一套件反向依存關係資訊\n"
-"   pkgnames - 顯示系統所有套件名稱\n"
-"   dotty - 產生用於 GraphViz 的套件圖表\n"
-"   xvcg - 產生用於 xvcg 的套件圖表\n"
-"   policy - 顯示政策設定\n"
+"   add - 把套件檔加入原始碼快取中\n"
+"   gencaches - 同時產生套件和原始碼的快取\n"
+"   showpkg - 顯示某單一套件的一般資訊\n"
+"   showsrc - 顯示原始碼報告\n"
+"   stats - 顯示一些基本的統計資訊\n"
+"   dump - 簡要得顯示整個檔案\n"
+"   dumpavail - 將可用的檔案列印至標準輸出\n"
+"   unmet - 顯示所有未滿足的相依關係\n"
+"   search - 根據正規表示式搜索套件列表\n"
+"   show - 顯示該套件的易於閱讀的報告\n"
+"   depends - 顯示該套件的原始相依關係的資訊\n"
+"   rdepends - 顯示所有相依於該套件的套件名稱\n"
+"   pkgnames - 列出系統中所有套件\n"
+"   dotty - 產生用於 GraphViz 的套件關係圖\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"
-"更多資訊見 apt-cache(8) 及 apt.conf(5) manual pages.\n"
+"選項：\n"
+"  -h   本幫助訊息。\n"
+"  -p=? 套件的快取。\n"
+"  -s=? 原始碼的快取。\n"
+"  -q   關閉進度顯示。\n"
+"  -i   僅為 unmet 指令顯示重要的相依關係。\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
+"請參閱 apt-cache(8) 及 apt.conf(5) 參考手冊以取得更多資訊。\n"
 
 #: cmdline/apt-cdrom.cc:79
+#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "請為此光碟提供名稱，如 Debian 5.0.3 Disk 1"
+msgstr "請替這張光碟取個名字，像是 'Debian 2.1r1 Disk 1'"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
-msgstr "請把光碟放入光碟機，然後按 [Enter] 鍵"
+msgstr "請把光碟放入光碟機，然後按下 [Enter] 鍵"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "未能將 %s 掛載至 %s"
+msgstr "無法將 %s 更名為 %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "請對光碟組其他光碟重複相同操作。"
+msgstr "請對您的光碟組中的其它光碟重複相同的操作。"
 
 #: cmdline/apt-config.cc:46
 msgid "Arguments not in pairs"
-msgstr "引數並未成對"
+msgstr "參數並未成對"
 
 #: cmdline/apt-config.cc:87
 msgid ""
@@ -269,18 +273,18 @@ 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 - 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-get.cc:135
 msgid "Y"
@@ -297,57 +301,57 @@ msgstr "編譯正規表示式時發生錯誤 - %s"
 
 #: cmdline/apt-get.cc:260
 msgid "The following packages have unmet dependencies:"
-msgstr "以下套件有未滿足的依存關係："
+msgstr "下列的套件有未滿足的相依關係："
 
 #: cmdline/apt-get.cc:350
 #, c-format
 msgid "but %s is installed"
-msgstr "但卻已安裝 %s"
+msgstr "但 %s 卻已安裝"
 
 #: cmdline/apt-get.cc:352
 #, c-format
 msgid "but %s is to be installed"
-msgstr "但卻要安裝 %s"
+msgstr "但 %s 卻將被安裝"
 
 #: cmdline/apt-get.cc:359
 msgid "but it is not installable"
-msgstr "但其無法安裝"
+msgstr "但它卻無法安裝"
 
 #: cmdline/apt-get.cc:361
 msgid "but it is a virtual package"
-msgstr "但其為虛擬套件"
+msgstr "但它是虛擬套件"
 
 #: cmdline/apt-get.cc:364
 msgid "but it is not installed"
-msgstr "但其尚未安裝"
+msgstr "但它卻尚未安裝"
 
 #: cmdline/apt-get.cc:364
 msgid "but it is not going to be installed"
-msgstr "但其卻不會安裝"
+msgstr "但它卻將不會被安裝"
 
 #: cmdline/apt-get.cc:369
 msgid " or"
-msgstr " 或"
+msgstr "或"
 
 #: cmdline/apt-get.cc:398
 msgid "The following NEW packages will be installed:"
-msgstr "會安裝以下【新】套件："
+msgstr "下列【新】套件將會被安裝："
 
 #: cmdline/apt-get.cc:424
 msgid "The following packages will be REMOVED:"
-msgstr "會【移除】以下套件："
+msgstr "下列套件將會被【移除】："
 
 #: cmdline/apt-get.cc:446
 msgid "The following packages have been kept back:"
-msgstr "以下套件維持其原有版本："
+msgstr "下列套件將會維持其原有版本："
 
 #: cmdline/apt-get.cc:467
 msgid "The following packages will be upgraded:"
-msgstr "會升級以下套件："
+msgstr "下列套件將會被升級："
 
 #: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
-msgstr "會【降級】以下套件："
+msgstr "下列套件將會被【降級】："
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
@@ -356,7 +360,7 @@ msgstr "下列被保留 (hold) 的套件將會被更改："
 #: cmdline/apt-get.cc:563
 #, c-format
 msgid "%s (due to %s) "
-msgstr "%s（因為 %s） "
+msgstr "%s（因為 %s）"
 
 #: cmdline/apt-get.cc:571
 msgid ""
@@ -369,50 +373,51 @@ msgstr ""
 #: cmdline/apt-get.cc:602
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "升級 %lu 個、新安裝 %lu 個、 "
+msgstr "升級 %lu 個，新安裝 %lu 個，"
 
 #: cmdline/apt-get.cc:606
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "重新安裝 %lu 個、 "
+msgstr "重新安裝 %lu 個，"
 
 #: cmdline/apt-get.cc:608
 #, c-format
 msgid "%lu downgraded, "
-msgstr "降級 %lu 個、 "
+msgstr "降級 %lu 個，"
 
 #: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "移除 %lu 個、還有 %lu 個毋須或不會升級。\n"
+msgstr "移除 %lu 個，有 %lu 個未被升級。\n"
 
 #: cmdline/apt-get.cc:614
 #, c-format
 msgid "%lu not fully installed or removed.\n"
-msgstr "%lu 個沒有完全安裝或移除。\n"
+msgstr "%lu 個沒有完整得安裝或移除。\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "注意，為 %2$s 任務選取 %1$s\n"
+msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "注意，為 %2$s regex 選取 %1$s\n"
+msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s 是虛擬套件，提供者為：\n"
+msgstr "套件 %s 是虛擬套件，提供者為：\n"
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
-msgstr " 【已安裝】"
+msgstr "【已安裝】"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr " [非候選版本]"
+msgstr "候選版本"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -433,9 +438,9 @@ msgid "However the following packages replace it:"
 msgstr "然而，下列的套件取代了它："
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "%s 套件無可安裝版本"
+msgstr "套件 %s 沒有可安裝的候選版本"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -444,34 +449,34 @@ msgstr "無法移除如 %s 的虛擬套件\n"
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "套件 %s 並沒有被安裝，所以也不會被移除\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "注意，選取 %s 而非 %s\n"
+msgstr "注意，選擇了以 %s 替代 %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "略過 %s，其已安裝而且沒有指定要升級。\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 
 #: cmdline/apt-get.cc:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "略過 %s，其未有安裝但卻只指定要升級。\n"
+msgstr "忽略 %s，它已被安裝且沒有計劃要進行升級。\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "無法重新安裝 %s，因其無法下載。\n"
+msgstr "無法重新安裝 %s，因為它無法下載。\n"
 
 #: cmdline/apt-get.cc:839
 #, c-format
@@ -484,18 +489,18 @@ msgid "%s set to manually installed.\n"
 msgstr "%s 被設定為手動安裝。\n"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, 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:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "為 %3$s 選取 %1$s (%2$s)，因為 %4$s\n"
+msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
-msgstr "正在修正依存關係..."
+msgstr "正在修正相依關係..."
 
 #: cmdline/apt-get.cc:1028
 msgid " failed."
@@ -503,7 +508,7 @@ msgstr " 失敗。"
 
 #: cmdline/apt-get.cc:1031
 msgid "Unable to correct dependencies"
-msgstr "無法修正依存關係"
+msgstr "無法修正相依關係"
 
 #: cmdline/apt-get.cc:1034
 msgid "Unable to minimize the upgrade set"
@@ -515,7 +520,7 @@ msgstr " 完成"
 
 #: cmdline/apt-get.cc:1040
 msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "您也許得執行 apt-get -f install 以修正這些問題。"
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題。"
 
 #: cmdline/apt-get.cc:1043
 msgid "Unmet dependencies. Try using -f."
@@ -523,19 +528,19 @@ msgstr "未能滿足相依關係。試試 -f 選項。"
 
 #: cmdline/apt-get.cc:1068
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "【警告】：無法核實以下套件的真偽！"
+msgstr "【警告】：無法驗證下列套件！"
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
-msgstr "忽略了核實警告。\n"
+msgstr "忽略了驗證警告。\n"
 
 #: cmdline/apt-get.cc:1079
 msgid "Install these packages without verification [y/N]? "
-msgstr "是否不經驗證就安裝這些套件[y/N]？ "
+msgstr "是否不經驗證就安裝這些套件？[y/N]"
 
 #: cmdline/apt-get.cc:1081
 msgid "Some packages could not be authenticated"
-msgstr "部份套件無法核實真偽"
+msgstr "有部份套件無法驗證"
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
@@ -594,7 +599,7 @@ msgstr "無法確認 %s 的未使用空間"
 #: cmdline/apt-get.cc:1241
 #, c-format
 msgid "You don't have enough free space in %s."
-msgstr "%s 沒有足夠空間。"
+msgstr "在 %s 裡沒有足夠的的未使用空間。"
 
 #: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277
 msgid "Trivial Only specified but this is not a trivial operation."
@@ -602,7 +607,7 @@ msgstr "雖然指定了 Trivial Only（自動答 NO）選項，但這並不是 t
 
 #: cmdline/apt-get.cc:1259
 msgid "Yes, do as I say!"
-msgstr "是的，照我的說話去做！"
+msgstr "Yes, do as I say!"
 
 #: cmdline/apt-get.cc:1261
 #, c-format
@@ -621,16 +626,16 @@ msgstr "放棄執行。"
 
 #: cmdline/apt-get.cc:1282
 msgid "Do you want to continue [Y/n]? "
-msgstr "是否繼續進行 [Y/n]？ "
+msgstr "是否繼續進行 [Y/n]？"
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "未能取得 %s %s\n"
+msgstr "無法取得 %s，%s\n"
 
 #: cmdline/apt-get.cc:1372
 msgid "Some files failed to download"
-msgstr "未能下載某些檔案"
+msgstr "有部份檔案無法下載"
 
 #: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
 msgid "Download complete and in download only mode"
@@ -663,7 +668,8 @@ msgid ""
 msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
-msgstr[0] "以下套件已從您的系統消失，因其所有檔案已遭其他套件覆寫："
+msgstr[0] ""
+msgstr[1] ""
 
 #: cmdline/apt-get.cc:1421
 msgid "Note: This is done automatically and on purpose by dpkg."
@@ -675,9 +681,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr "略過無法提供的 %2$s 套件的 %1$s 目標版本"
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "揀選 %s 為源碼套件而非 %s\n"
+msgstr "無法取得來源套件列表 %s 的狀態"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -687,11 +693,11 @@ msgstr "略過無法提供的 %2$s 套件的 %1$s 版本"
 
 #: cmdline/apt-get.cc:1645
 msgid "The update command takes no arguments"
-msgstr "update 指令毋須引數"
+msgstr "update 指令不需任何參數"
 
 #: cmdline/apt-get.cc:1711
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "我們不會刪除任何東西，無法啟動 AutoRemover"
+msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover"
 
 #: cmdline/apt-get.cc:1815
 msgid ""
@@ -699,7 +705,7 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 "嗯，看起來 AutoRemover 弄壞了什麼東西，而這是不該發生的。\n"
-"請針對 apt 回報錯誤。"
+"請針對 apt 發佈錯誤回報。"
 
 #.
 #. if (Packages == 1)
@@ -717,28 +723,32 @@ msgstr "以下的資訊或許有助於解決當前的情況："
 
 #: cmdline/apt-get.cc:1822
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "內部錯誤，AutoRemover 弄壞了某些東西"
+msgstr "內部錯誤，AutoRemover 處理失敗"
 
 #: cmdline/apt-get.cc:1829
+#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] "以下套件為自動安裝，並且已經無用："
+msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
+msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu 個套件為自動安裝，並且已經無用。\n"
+msgstr[0] "以下套件是被自動安裝進來的，且已不再會被用到了："
+msgstr[1] "以下套件是被自動安裝進來的，且已不再會被用到了："
 
 #: cmdline/apt-get.cc:1835
+#, fuzzy
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "使用 'apt-get autoremove' 來將其移除。"
+msgstr[1] "使用 'apt-get autoremove' 來將其移除。"
 
 #: cmdline/apt-get.cc:1854
 msgid "Internal error, AllUpgrade broke stuff"
@@ -746,15 +756,15 @@ msgstr "內部錯誤，AllUpgrade 造成了損壞"
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "您也許得執行 apt-get -f install 以修正這些問題："
+msgstr "您也許得執行 'apt-get -f install' 以修正這些問題："
 
 #: cmdline/apt-get.cc:1957
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"相依關係無法滿足。請嘗試不指定套件執行 apt-get -f install（或指\r\n"
-"定解決辦法）。"
+"未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解"
+"決方案）。"
 
 #: cmdline/apt-get.cc:1972
 msgid ""
@@ -772,25 +782,25 @@ msgstr "損毀的套件"
 
 #: cmdline/apt-get.cc:2019
 msgid "The following extra packages will be installed:"
-msgstr "會安裝以下額外套件："
+msgstr "下列的額外套件將被安裝："
 
 #: cmdline/apt-get.cc:2109
 msgid "Suggested packages:"
-msgstr "建議安裝套件："
+msgstr "建議套件："
 
 #: cmdline/apt-get.cc:2110
 msgid "Recommended packages:"
-msgstr "推薦安裝套件："
+msgstr "推薦套件："
 
 #: cmdline/apt-get.cc:2152
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "找不到 %s 套件"
+msgstr "無法找到套件 %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s 設定為自動安裝。\n"
+msgstr "%s 被設定為手動安裝。\n"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -800,7 +810,7 @@ msgstr "此指令已不再用。請改用 apt-mark auto 及 apt-mark manual"
 
 #: cmdline/apt-get.cc:2183
 msgid "Calculating upgrade... "
-msgstr "正在籌畫升級... "
+msgstr "籌備升級中... "
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -865,7 +875,7 @@ msgstr "略過已下載的檔案 '%s'\n"
 #: cmdline/apt-get.cc:2603
 #, c-format
 msgid "You don't have enough free space in %s"
-msgstr "%s 無足夠空間"
+msgstr "在 %s 裡沒有足夠的的未使用空間"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
@@ -888,7 +898,7 @@ msgstr "取得原始碼 %s\n"
 
 #: cmdline/apt-get.cc:2661
 msgid "Failed to fetch some archives."
-msgstr "未能取得某些套件檔。"
+msgstr "無法取得某些套件檔。"
 
 #: cmdline/apt-get.cc:2692
 #, c-format
@@ -903,7 +913,7 @@ msgstr "解開指令 '%s' 失敗。\n"
 #: cmdline/apt-get.cc:2705
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "檢查是否已安裝 dpkg-dev 套件。\n"
+msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n"
 
 #: cmdline/apt-get.cc:2727
 #, c-format
@@ -936,12 +946,11 @@ msgid "%s has no build depends.\n"
 msgstr "%s 沒有編譯相依關係。\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
-msgstr ""
-"由於 %3$s 不允許用於 %4$s 套件，因此無法滿足 %2$s 所要求的 %1$s 依存關係"
+msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -953,48 +962,48 @@ msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件
 #: cmdline/apt-get.cc:3049
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "未能滿足 %2$s 所要求的 %1$s 相依關係：已安裝的 %3$s 套件太新"
+msgstr "無法滿足 %2$s 的相依關係 %1$s：已安裝的套件 %3$s 太新了"
 
 #: cmdline/apt-get.cc:3088
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
-"由於 %3$s 套件的候選版本無法滿足版本要求，因此無法滿足 %2$s 所要求的 %1$s 依"
-"存關係"
+"無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
-msgstr "由於 %3$s 沒有候選版本，因此無法滿足 %2$s 所要求的 %1$s 依存關係"
+msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s"
 
 #: cmdline/apt-get.cc:3117
 #, 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:3133
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "無法滿足套件 %s 的編譯依存關係。"
+msgstr "無法滿足套件 %s 的編譯相依關係。"
 
 #: cmdline/apt-get.cc:3138
 msgid "Failed to process build dependencies"
-msgstr "未能處理編譯依存關係"
+msgstr "無法處理編譯相依關係"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr "%s (%s) 之變更記錄"
+msgstr "正和 %s (%s) 連線"
 
 #: cmdline/apt-get.cc:3369
 msgid "Supported modules:"
-msgstr "支援的模組："
+msgstr "已支援模組："
 
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1039,48 +1048,45 @@ msgid ""
 "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"
+"用法：apt-get [選項] 指令\n"
+"      apt-get [選項] install|remove 套件1 [套件2 ...]\n"
+"      apt-get [選項] source 套件1 [套件2 ...]\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"
+"apt-get 是一個用來下載和安裝套件的簡易命令列界面。\n"
+"最常用指令是 update 和 install。\n"
 "\n"
 "指令:\n"
-"   update - 取得新套件清單\n"
+"   update - 取得新的套件列表\n"
 "   upgrade - 進行升級\n"
-"   install - 安裝新套件 (「套件」為 libc6 而非 libc6.deb)\n"
+"   install - 安裝新套件（套件名稱是 libc6 而不是 libc6.deb）\n"
 "   remove - 移除套件\n"
-"   autoremove - 自動移除所有無用套件\n"
-"   purge - 移除套件及設定檔\n"
-"   source - 下載源碼檔\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - 發行版升級，見 apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - 清除已下載套件檔\n"
-"   autoclean - 清除已下載舊套件檔\n"
-"   check - Verify that there are no broken dependencies\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
+"   autoremove - 自動移除所有不再使用的套件\n"
+"   purge - 移除並清除套件\n"
+"   source - 下載套件原始碼\n"
+"   build-dep - 為原始碼套件配置編譯相依關係\n"
+"   dist-upgrade - 發行版本升級，請參閱 apt-get(8)\n"
+"   dselect-upgrade - 採用 dselect 的選項升級\n"
+"   clean - 刪除已下載的套件檔\n"
+"   auto-clean - 刪除已下載但已有新版本的套件檔\n"
+"   check - 檢查相依關係是否有問題\n"
 "\n"
-"選項:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  只下載 - 下安裝或解開套件檔\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\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"
-"更多資料及選項見 apt-get(8), sources.list(5) 及 apt.conf(5) manual\n"
-"page\n"
-"                       This APT has 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) 及 apt.conf(5) 的使用手冊\n"
+"以取得更多資訊和選項。\n"
+"                        該 APT 有著超級牛力。\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1127,50 +1133,50 @@ msgid ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
-"更換媒體：請把標籤為\n"
-" 「%s」的光碟\n"
-"插入「%s」碟機，然後按 [Enter] 鍵\n"
+"更換媒體：請把以下名稱的光碟\n"
+" '%s'\n"
+"放入 '%s' 裝置，然後按 [Enter] 鍵\n"
 
 #: cmdline/apt-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr "無法標記 %s，因其未安裝。\n"
+msgstr "但它卻尚未安裝"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr "%s 已設為已由手動安裝。\n"
+msgstr "%s 被設定為手動安裝。\n"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr "%s 已設為已自動安裝。\n"
+msgstr "%s 被設定為手動安裝。\n"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr "%s 已設為保留\n"
+msgstr "%s 已經是最新版本了。\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr "%s 已設為不保留\n"
+msgstr "%s 已經是最新版本了。\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
 #, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr "等待 %s 但其並不存在"
+msgstr "等待 %s 但是它並不存在"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr "%s 設為保留。\n"
+msgstr "%s 被設定為手動安裝。\n"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr "取消於 %s 的保留。\n"
+msgstr "無法開啟 %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1217,7 +1223,7 @@ msgstr "不正確的光碟"
 #: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "無法卸載 %s 裡的光碟片，或許其仍在使用。"
+msgstr "無法卸載 %s 裡的光碟片，或許它仍在使用中。"
 
 #: methods/cdrom.cc:254
 msgid "Disk not found."
@@ -1230,11 +1236,11 @@ msgstr "找不到檔案"
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 #: methods/rred.cc:512 methods/rred.cc:521
 msgid "Failed to stat"
-msgstr "未能取得狀態"
+msgstr "無法取得狀態"
 
 #: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
 msgid "Failed to set modification time"
-msgstr "未能設定修改時間"
+msgstr "無法設定修改時間"
 
 #: methods/file.cc:47
 msgid "Invalid URI, local URIS must not start with //"
@@ -1247,11 +1253,11 @@ msgstr "登入中"
 
 #: methods/ftp.cc:179
 msgid "Unable to determine the peer name"
-msgstr "無法確定對方主機名稱"
+msgstr "無法解析對方主機名稱"
 
 #: methods/ftp.cc:184
 msgid "Unable to determine the local name"
-msgstr "無法確定本機名稱"
+msgstr "無法解析本機名稱"
 
 #: methods/ftp.cc:215 methods/ftp.cc:243
 #, c-format
@@ -1338,7 +1344,7 @@ msgstr "無法監聽 socket"
 
 #: methods/ftp.cc:755
 msgid "Could not determine the socket's name"
-msgstr "無法確定 socket 名稱"
+msgstr "無法解析 socket 名稱"
 
 #: methods/ftp.cc:787
 msgid "Unable to send PORT command"
@@ -1364,7 +1370,7 @@ msgstr "無法接受連線"
 
 #: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
 msgid "Problem hashing file"
-msgstr "為檔案製作雜湊時發生問題"
+msgstr "有問題的雜湊檔"
 
 #: methods/ftp.cc:885
 #, c-format
@@ -1437,27 +1443,28 @@ msgid "Temporary failure resolving '%s'"
 msgstr "暫時無法解析 '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解析 '%s:%s' (%i - %s) 時發生奇怪問題"
+msgstr "在解析 '%s:%s' (%i) 時出了怪事"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "無法連接 %s:%s:"
+msgstr "無法連線至 %s %s："
 
 #: methods/gpgv.cc:180
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "內部錯誤：簽章無誤，但卻無法確定密鑰的指紋碼？！"
+msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！"
 
 #: methods/gpgv.cc:185
 msgid "At least one invalid signature was encountered."
 msgstr "至少發現一個無效的簽章。"
 
 #: methods/gpgv.cc:189
+#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "無法執行 'gpgv' 以核對簽章 (安裝 gpgv 了嗎？)"
+msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）"
 
 #: methods/gpgv.cc:194
 msgid "Unknown error executing gpgv"
@@ -1465,13 +1472,13 @@ msgstr "在執行 gpgv 時發生未知的錯誤"
 
 #: methods/gpgv.cc:228 methods/gpgv.cc:235
 msgid "The following signatures were invalid:\n"
-msgstr "以下簽章無效：\n"
+msgstr "以下簽名無效：\n"
 
 #: methods/gpgv.cc:242
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
-msgstr "以下簽章無法進行驗證，因為未能取得其公鑰：\n"
+msgstr "由於無法取得它們的公鑰，以下簽章無法進行驗證：\n"
 
 #: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
@@ -1503,11 +1510,11 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題"
 
 #: methods/http.cc:647
 msgid "Unknown date format"
-msgstr "資料格式不詳"
+msgstr "未知的資料格式"
 
 #: methods/http.cc:818
 msgid "Select failed"
-msgstr "未能選擇"
+msgstr "選擇失敗"
 
 #: methods/http.cc:823
 msgid "Connection timed out"
@@ -1535,11 +1542,11 @@ msgstr "在讀取伺服器時發生錯誤"
 
 #: methods/http.cc:1194
 msgid "Bad header data"
-msgstr "標頭資料有誤"
+msgstr "錯誤的標頭資料"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
-msgstr "未能連線"
+msgstr "連線失敗"
 
 #: methods/http.cc:1358
 msgid "Internal error"
@@ -1574,9 +1581,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "無法開啟檔案 %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1599,7 +1606,7 @@ msgstr ""
 
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "未能和子程序建立 IPC 管線"
+msgstr "無法和子程序建立 IPC 管線"
 
 #: methods/rsh.cc:338
 msgid "Connection closed prematurely"
@@ -1616,24 +1623,26 @@ msgstr "請按 [Enter] 鍵以繼續進行。"
 
 #: dselect/install:91
 msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr "是否移除所有先前下載的 .deb 檔？"
+msgstr "您想移除所有先前下載的 .deb 檔嗎？"
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "解開套件時出錯。以下套件未能安裝："
+msgstr "在解開套件時發生錯誤。我要準備設定"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "會設定。可能會導致重複錯誤"
+msgstr "套件已安裝過。這會造成重複錯誤"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "或因為欠缺依存關係而造成的錯誤。只有該錯誤可被容忍"
+msgstr "或是因為沒有相依關係而造成錯誤。那麼這個錯誤是無關緊要的"
 
 #: dselect/install:104
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
-msgstr "以上的訊息相當重要。請將其修正並重新執行安裝[I]"
+msgstr "以上的訊息相當重要。請修正它們並重新執行安裝[I]"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1642,7 +1651,7 @@ msgstr "整合現有的資料"
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
 msgid "%s not a valid DEB package."
-msgstr "%s 並非有效 DEB 套件。"
+msgstr "%s 並不是正確的 DEB 套件。"
 
 #: cmdline/apt-extracttemplates.cc:236
 msgid ""
@@ -1657,16 +1666,16 @@ 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:271 apt-pkg/pkgcachegen.cc:1281
 #, c-format
@@ -1675,7 +1684,7 @@ msgstr "無法寫入 %s"
 
 #: cmdline/apt-extracttemplates.cc:313
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "無法得知 debconf 版本。有否安裝 debconf？"
+msgstr "無法取得 debconf 版本。是否有安裝 debconf？"
 
 #: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348
 msgid "Package extension list is too long"
@@ -1686,7 +1695,7 @@ msgstr "套件延伸列表過長"
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
 #, c-format
 msgid "Error processing directory %s"
-msgstr "處理 %s 目錄時發生錯誤"
+msgstr "處理目錄 %s 時發生錯誤"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1694,12 +1703,12 @@ msgstr "原始碼的延伸列表太長"
 
 #: ftparchive/apt-ftparchive.cc:378
 msgid "Error writing header to contents file"
-msgstr "將標頭資訊寫入內容檔案時發生錯誤"
+msgstr "寫入標頭資訊到內容檔時發生錯誤"
 
 #: ftparchive/apt-ftparchive.cc:408
 #, c-format
 msgid "Error processing contents %s"
-msgstr "處理 %s 內容時發生錯誤"
+msgstr "處理內容 %s 時發生錯誤"
 
 #: ftparchive/apt-ftparchive.cc:596
 msgid ""
@@ -1786,12 +1795,12 @@ msgstr "找不到符合的選項"
 #: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "套件檔案組「%s」欠缺部份檔案"
+msgstr "套件檔案組 `%s' 少了部份檔案"
 
 #: ftparchive/cachedb.cc:47
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB 已損毀，檔案已更名為 %s.old"
+msgstr "DB 已損毀，檔案被更名為 %s.old"
 
 #: ftparchive/cachedb.cc:65
 #, c-format
@@ -1799,10 +1808,12 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "DB 過舊，嘗試升級 %s"
 
 #: ftparchive/cachedb.cc:76
+#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
-msgstr "DB 格式無效。如從舊版 apt 升級，請移除並重新建立資料庫。"
+msgstr ""
+"資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。"
 
 #: ftparchive/cachedb.cc:81
 #, c-format
@@ -1813,11 +1824,11 @@ msgstr "無法開啟 DB 檔 %s: %s"
 #: apt-inst/extract.cc:210
 #, c-format
 msgid "Failed to stat %s"
-msgstr "未能取得 %s 的狀態"
+msgstr "無法取得 %s 的狀態"
 
 #: ftparchive/cachedb.cc:249
 msgid "Archive has no control record"
-msgstr "套件檔沒有控制記錄"
+msgstr "套件檔沒有 control 記錄"
 
 #: ftparchive/cachedb.cc:490
 msgid "Unable to get a cursor"
@@ -1826,7 +1837,7 @@ msgstr "無法取得遊標"
 #: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "警告：無法讀取 %s 目錄\n"
+msgstr "警告：無法讀取目錄 %s\n"
 
 #: ftparchive/writer.cc:85
 #, c-format
@@ -1835,58 +1846,58 @@ msgstr "警告：無法取得 %s 狀態\n"
 
 #: ftparchive/writer.cc:141
 msgid "E: "
-msgstr "錯誤： "
+msgstr "錯誤："
 
 #: ftparchive/writer.cc:143
 msgid "W: "
-msgstr "警告： "
+msgstr "警告："
 
 #: ftparchive/writer.cc:150
 msgid "E: Errors apply to file "
-msgstr "錯誤：套用到檔案時發生錯誤 "
+msgstr "錯誤：套用到檔案時發生錯誤"
 
 #: ftparchive/writer.cc:168 ftparchive/writer.cc:200
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "未能解析 %s"
+msgstr "無法解析 %s"
 
 #: ftparchive/writer.cc:181
 msgid "Tree walking failed"
-msgstr "未能走訪目錄樹"
+msgstr "無法走訪目錄樹"
 
 #: ftparchive/writer.cc:208
 #, c-format
 msgid "Failed to open %s"
-msgstr "未能開啟 %s"
+msgstr "無法開啟 %s"
 
 #: ftparchive/writer.cc:267
 #, c-format
 msgid " DeLink %s [%s]\n"
-msgstr " 解除連結 %s [%s]\n"
+msgstr " DeLink %s [%s]\n"
 
 #: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "未能讀取連結 %s"
+msgstr "無法讀取連結 %s"
 
 #: ftparchive/writer.cc:279
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "未能取消連結 %s"
+msgstr "無法移除連結 %s"
 
 #: ftparchive/writer.cc:286
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** 未能將 %s 連結到 %s"
+msgstr "*** 無法將 %s 連結到 %s"
 
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " 達到了解除連結的上限 %sB。\n"
+msgstr " 達到了 DeLink 的上限 %sB。\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
-msgstr "套件檔沒有套件欄位"
+msgstr "套件檔裡沒有套件資訊"
 
 #: ftparchive/writer.cc:409 ftparchive/writer.cc:711
 #, c-format
@@ -1910,7 +1921,7 @@ msgstr "  %s 也沒有二元碼重新定義項目\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 未能配置記憶體"
+msgstr "realloc - 無法配置記憶體"
 
 #: ftparchive/override.cc:35 ftparchive/override.cc:143
 #, c-format
@@ -1918,24 +1929,24 @@ msgid "Unable to open %s"
 msgstr "無法開啟 %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "重新定義 %s 的第 %llu #1 行格式有誤"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "重新定義 %s 的第 %llu #2 行格式有誤"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "重新定義 %s 的第 %llu #3 行格式有誤"
+msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "未能讀取重新定義檔 %s"
+msgstr "無法讀取重新定義檔 %s"
 
 #: ftparchive/multicompress.cc:70
 #, c-format
@@ -1949,7 +1960,7 @@ msgstr "要壓縮輸出 %s 需搭配壓縮動作"
 
 #: ftparchive/multicompress.cc:189
 msgid "Failed to create FILE*"
-msgstr "未能建立 FILE*"
+msgstr "無法建立 FILE*"
 
 #: ftparchive/multicompress.cc:192
 msgid "Failed to fork"
@@ -1980,9 +1991,10 @@ msgstr "在取消 %s 的連結時發生問題"
 #: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "未能將 %s 更名為 %s"
+msgstr "無法將 %s 更名為 %s"
 
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1995,6 +2007,16 @@ 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"
+"\n"
+"apt-extracttemplates 是用來從 debian 套件中解壓出設定檔和模板資訊\n"
+"的工具\n"
+"\n"
+"選項\n"
+"  -h   本幫助訊息。\n"
+"  -t   指定暫存目錄\n"
+"  -c=? 讀取指定的設定檔\n"
+"  -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n"
 
 #: cmdline/apt-sortpkgs.cc:89
 msgid "Unknown package record!"
@@ -2025,11 +2047,11 @@ msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
-msgstr "未能建立管線"
+msgstr "無法建立管線"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "未能執行 gzip "
+msgstr "無法執行 gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
@@ -2046,20 +2068,20 @@ msgstr "未知的 TAR 標頭類型 %u，成員 %s"
 
 #: apt-inst/contrib/arfile.cc:74
 msgid "Invalid archive signature"
-msgstr "套件檔簽章無效"
+msgstr "無效的套件庫簽章"
 
 #: apt-inst/contrib/arfile.cc:82
 msgid "Error reading archive member header"
 msgstr "讀取套件檔的成員標頭訊息時發生錯誤"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr "套件檔成員標頭 %s 無效"
+msgstr "無效的套件檔成員標頭"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
-msgstr "套件檔成員標頭無效"
+msgstr "無效的套件檔成員標頭"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Archive is too short"
@@ -2067,7 +2089,7 @@ msgstr "套件檔過短"
 
 #: apt-inst/contrib/arfile.cc:136
 msgid "Failed to read the archive headers"
-msgstr "未能讀取套件檔標頭"
+msgstr "讀取套件檔標頭失敗"
 
 #: apt-inst/filelist.cc:382
 msgid "DropNode called on still linked node"
@@ -2075,11 +2097,11 @@ msgstr "DropNode 在還有連結結點時被呼叫"
 
 #: apt-inst/filelist.cc:414
 msgid "Failed to locate the hash element!"
-msgstr "未能找到雜湊元件！"
+msgstr "找不到雜湊元件！"
 
 #: apt-inst/filelist.cc:461
 msgid "Failed to allocate diversion"
-msgstr "未能配置抽換資訊"
+msgstr "在配置抽換資訊時失敗"
 
 #: apt-inst/filelist.cc:466
 msgid "Internal error in AddDiversion"
@@ -2103,12 +2125,12 @@ msgstr "重複的設定檔 %s/%s"
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, c-format
 msgid "Failed to write file %s"
-msgstr "未能寫入 %s 檔案"
+msgstr "寫入檔案 %s 失敗"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
-msgstr "未能關閉 %s 檔案"
+msgstr "關閉檔案 %s 失敗"
 
 #: apt-inst/extract.cc:96 apt-inst/extract.cc:167
 #, c-format
@@ -2141,7 +2163,7 @@ 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"
@@ -2155,7 +2177,7 @@ msgstr "以無版本的 %s 覆寫原始套件"
 #: apt-inst/extract.cc:432
 #, 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:492
 #, c-format
@@ -2165,53 +2187,55 @@ msgstr "無法取得 %s 的狀態"
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "這並非有效 DEB 套件檔，欠缺 %s 成員"
+msgstr "這是個不正確的 DEB 套件檔，沒有 '%s' 成員"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "這並非有效 DEB 套件檔，沒有 %s、%s 或 %s 成員"
+msgstr "這是個不正確的 DEB 套件檔，沒有 '%s', '%s' 或 '%s' 成員"
 
 #: apt-inst/deb/debfile.cc:120
 #, c-format
 msgid "Internal error, could not locate member %s"
-msgstr "內部錯誤，找不到成員 %s"
+msgstr "內部錯誤，找不找到成員 %s"
 
 #: apt-inst/deb/debfile.cc:214
 msgid "Unparsable control file"
-msgstr "控制檔無法解讀"
+msgstr "無法分析的 control 檔"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "不能 mmap 空白檔案"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "無法複製檔案 descriptor %i"
+msgstr "無法開啟管線給 %s 使用"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "無法製作 %llu 位元組的 mmap"
+msgstr "無法 mmap 到 %lu 位元組"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr "無法關閉 mmap"
+msgstr "無法開啟 %s"
 
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "無法為 mmap 進行同步化"
+msgstr "無法 invoke "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
-msgstr "無法製作 %lu 位元組的 mmap"
+msgstr "無法 mmap 到 %lu 位元組"
 
 #: apt-pkg/contrib/mmap.cc:322
 msgid "Failed to truncate file"
-msgstr "未能截短檔案"
+msgstr "無法截短檔案"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2261,7 +2285,7 @@ msgstr "%li秒"
 #: apt-pkg/contrib/strutl.cc:1167
 #, c-format
 msgid "Selection %s not found"
-msgstr "找不到 %s 選項"
+msgstr "選項 %s 找不到"
 
 #: apt-pkg/contrib/configuration.cc:491
 #, c-format
@@ -2281,7 +2305,7 @@ msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。"
 #: apt-pkg/contrib/configuration.cc:792
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "語法錯誤 %s:%u：標記格式錯誤"
+msgstr "語法錯誤 %s:%u：標籤格式錯誤"
 
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
@@ -2291,12 +2315,12 @@ msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾"
 #: apt-pkg/contrib/configuration.cc:849
 #, 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:856
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "語法錯誤 %s:%u：太多巢狀引入檔"
+msgstr "語法錯誤 %s:%u: 太多巢狀引入檔"
 
 #: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
 #, c-format
@@ -2306,12 +2330,12 @@ msgstr "語法錯誤 %s:%u：從此引入"
 #: apt-pkg/contrib/configuration.cc:869
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "語法錯誤 %s:%u：不支援的指示 '%s'"
+msgstr "語法錯誤 %s:%u：不支援的指令 '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "語法錯誤 %s:%u：清除指示需要以選項樹狀結構為引數"
+msgstr "語法錯誤 %s:%u：指令只能於最高層級執行"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2331,23 +2355,23 @@ 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:105 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:168 apt-pkg/contrib/cmndline.cc:189
 #, c-format
 msgid "Option %s requires an argument."
-msgstr "需替選項 %s 指定引數。"
+msgstr "需替選項 %s 指定參數。"
 
 #: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
 #, c-format
@@ -2357,7 +2381,7 @@ msgstr "選項 %s：在指定設定項目時應該有 =<val>。"
 #: 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
@@ -2381,17 +2405,17 @@ msgstr "無法取得掛載點 %s 的狀態"
 
 #: apt-pkg/contrib/cdromutl.cc:224
 msgid "Failed to stat the cdrom"
-msgstr "未能取得 CD-ROM 的狀態"
+msgstr "無法取得 CD-ROM 的狀態"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "關閉 gzip 檔案 %s 時發生問題"
+msgstr "在關閉檔案時發生問題"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
 msgid "Not using locking for read only lock file %s"
-msgstr "不在唯讀檔案 %s 使用檔案鎖定"
+msgstr "不在唯讀檔案 %s 上使用檔案鎖定"
 
 #: apt-pkg/contrib/fileutl.cc:230
 #, c-format
@@ -2401,7 +2425,7 @@ msgstr "無法開啟鎖定檔 %s"
 #: apt-pkg/contrib/fileutl.cc:248
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr "不在以 nfs 掛載的檔案 %s 使用檔案鎖定"
+msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定"
 
 #: apt-pkg/contrib/fileutl.cc:252
 #, c-format
@@ -2435,9 +2459,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "子程序 %s 收到一個記憶體錯誤。"
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "子程序 %s 收到 %u 訊號。"
+msgstr "子程序 %s 收到一個記憶體錯誤。"
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2447,50 +2471,50 @@ msgstr "子程序 %s 傳回錯誤碼 (%u)"
 #: apt-pkg/contrib/fileutl.cc:848
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
-msgstr "子程序 %s 不正常結束"
+msgstr "子程序 %s 不預期得結束"
 
 #: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
 #, c-format
 msgid "Could not open file %s"
-msgstr "無法開啟 %s 檔案"
+msgstr "無法開啟檔案 %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr "無法開啟檔案 descriptor %d"
+msgstr "無法開啟管線給 %s 使用"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
-msgstr "未能建立子程序 IPC"
+msgstr "無法建立子程序 IPC"
 
 #: apt-pkg/contrib/fileutl.cc:1212
 msgid "Failed to exec compressor "
-msgstr "未能執行壓縮程式 "
+msgstr "無法執行壓縮程式"
 
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "讀取，仍有 %lu 未讀但已無空間"
 
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr "閉關 %s 檔案時發生問題"
+msgstr "在關閉檔案時發生問題"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "將 %s 檔案更名為 %s 時發生問題"
+msgstr "在同步檔案時發生問題"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr "取消 %s 檔案的連結時發生問題"
+msgstr "在刪除檔案時發生問題"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2509,8 +2533,9 @@ msgid "The package cache file is an incompatible version"
 msgstr "套件快取檔版本不符"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "套件快取檔已毀壞，檔案太小"
+msgstr "套件快取檔損壞"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2523,11 +2548,11 @@ msgstr "這個套件快取是用於另一種平台的"
 
 #: apt-pkg/pkgcache.cc:305
 msgid "Depends"
-msgstr "依存於"
+msgstr "相依關係"
 
 #: apt-pkg/pkgcache.cc:305
 msgid "PreDepends"
-msgstr "預先依存於"
+msgstr "預先相依關係"
 
 #: apt-pkg/pkgcache.cc:305
 msgid "Suggests"
@@ -2571,7 +2596,7 @@ msgstr "標準"
 
 #: apt-pkg/pkgcache.cc:319
 msgid "optional"
-msgstr "可有可無"
+msgstr "次要"
 
 #: apt-pkg/pkgcache.cc:319
 msgid "extra"
@@ -2579,7 +2604,7 @@ msgstr "額外"
 
 #: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
 msgid "Building dependency tree"
-msgstr "正在了解依存關係"
+msgstr "正在重建相依關係"
 
 #: apt-pkg/depcache.cc:133
 msgid "Candidate versions"
@@ -2587,7 +2612,7 @@ msgstr "候選版本"
 
 #: apt-pkg/depcache.cc:162
 msgid "Dependency generation"
-msgstr "建立依存關係"
+msgstr "建立相依關係"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
 msgid "Reading state information"
@@ -2596,12 +2621,12 @@ msgstr "正在讀取狀態資料"
 #: apt-pkg/depcache.cc:244
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr "未能開啟狀態檔案 %s"
+msgstr "無法開啟 StateFile %s"
 
 #: apt-pkg/depcache.cc:250
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "未能寫入暫存的狀態檔案 %s"
+msgstr "無法寫入暫存的 StateFile %s"
 
 #: apt-pkg/tagfile.cc:129
 #, c-format
@@ -2614,29 +2639,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "無法辨識套件檔 %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
 #: apt-pkg/sourcelist.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
+msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2691,9 +2716,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr "無法設定 '%s'。 "
+msgstr "無法開啟檔案 %s"
 
 #: apt-pkg/packagemanager.cc:545
 #, c-format
@@ -2708,7 +2733,7 @@ msgstr ""
 #: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "不支援的索引檔類型 '%s'"
+msgstr "不被支援的索引檔類型 '%s'"
 
 #: apt-pkg/algorithms.cc:261
 #, c-format
@@ -2729,25 +2754,26 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr "無法修正問題，您保留 (hold) 了損毀的套件。"
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
-msgstr "某些索引檔未能下載。其已遭略過，或改為使用舊的。"
+msgstr "有一些索引檔不能下載，它們可能被略過了，或是替而使用原有的索引檔。"
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "找不到清單目錄 %spartial。"
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "找不到套件檔目錄 %spartial。"
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr "無法鎖定 %s 目錄"
+msgstr "無法鎖定列表目錄"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2814,9 +2840,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭"
 
 #: apt-pkg/policy.cc:418
 #, c-format
@@ -2841,9 +2867,9 @@ msgstr "快取使用的是不相容的版本系統"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "處理 %s (%s%d) 時出錯"
+msgstr "在處理 %s 時發生錯誤 (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2887,7 +2913,7 @@ msgstr "在儲存來源快取時 IO 錯誤"
 #: apt-pkg/acquire-item.cc:139
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
-msgstr "未能重新命名，%s (%s -> %s)。"
+msgstr "無法重新命名，%s (%s -> %s)。"
 
 #: apt-pkg/acquire-item.cc:599
 msgid "MD5Sum mismatch"
@@ -2906,9 +2932,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "無法辨別 Release 檔 %s"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2981,14 +3007,14 @@ msgid "No Hash entry in Release file %s"
 msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "在 Release 檔 %s 裡沒有 Hash 項目"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -3006,7 +3032,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
 msgid "Identifying.. "
-msgstr "正在識別.. "
+msgstr "正在識別.."
 
 #: apt-pkg/cdrom.cc:613
 #, c-format
@@ -3032,18 +3058,18 @@ msgstr "正在等待碟片...\n"
 
 #: apt-pkg/cdrom.cc:674
 msgid "Mounting CD-ROM...\n"
-msgstr "正在掛載光碟機...\n"
+msgstr "正在掛載光碟機... \n"
 
 #: apt-pkg/cdrom.cc:693
 msgid "Scanning disc for index files..\n"
-msgstr "正在掃描碟片的索引檔..\n"
+msgstr "正在掃描碟片中的索引檔..\n"
 
 #: apt-pkg/cdrom.cc:744
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
-msgstr "找到了 %zu 個套件索引、%zu 個原始碼索引、%zu 個翻譯索引及 %zu 個簽章\n"
+msgstr "找到了 %zu 個套件索引，%zu 個原始碼索引，%zu 個翻譯索引及 %zu 個簽章\n"
 
 #: apt-pkg/cdrom.cc:755
 msgid ""
@@ -3058,7 +3084,7 @@ msgstr "找到標籤 '%s'\n"
 
 #: apt-pkg/cdrom.cc:811
 msgid "That is not a valid name, try again.\n"
-msgstr "這並非有效名稱，請重試。\n"
+msgstr "這並不是正確的名稱，請重試。\n"
 
 #: apt-pkg/cdrom.cc:828
 #, c-format
@@ -3107,9 +3133,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Hash Sum 不符"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -3118,9 +3144,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr "%s 未有安裝鑰匙圈"
+msgstr "放棄安裝。"
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -3130,17 +3156,17 @@ msgstr "找不到 '%2$s' 的 '%1$s' 發行版"
 #: apt-pkg/cacheset.cc:406
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "找不到 %2$s 的 %1$s 版本"
+msgstr "找不到 '%s' 版的 '%s'"
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr "無法找到 %s 任務"
+msgstr "無法找到主題 %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "無法按 regex 找到 %s 套件"
+msgstr "無法找到套件 %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3205,9 +3231,9 @@ msgid "Removing %s"
 msgstr "正在移除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr "正在完全移除 %s"
+msgstr "已完整移除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3226,9 +3252,9 @@ msgid "Directory '%s' missing"
 msgstr "找不到 '%s' 目錄"
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr "無法開啟 '%s' 檔案"
+msgstr "無法開啟檔案 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
 #, c-format
@@ -3328,9 +3354,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "無法鎖定列表目錄"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3344,27 +3370,48 @@ msgstr "dpkg 作業遭中斷，必須手動執行 '%s' 以修正問題。 "
 msgid "Not locked"
 msgstr "未鎖定"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "取得一個單行超過 %u 字元的標頭"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "開啟設定檔 %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "無法開啟管線給 %s 使用"
+#~ msgid "Failed to remove %s"
+#~ msgstr "無法移除 %s"
 
-#~ msgid "The pkg cache must be initialized first"
-#~ msgstr "套件快取必須先初始化"
+#~ msgid "Unable to create %s"
+#~ msgstr "無法建立 %s"
 
-#~ msgid "Internal error getting a node"
-#~ msgstr "內部錯誤，無法取得節點"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "無法取得 %sinfo 的狀態"
+
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr "資料目錄與暫存目錄需位於同一檔案系統中"
+
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "無法切換至管理者目錄 %sinfo"
 
 #~ msgid "Internal error getting a package name"
 #~ msgstr "內部錯誤，無法取得套件名稱"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "無法建立 %s"
-
 #~ msgid "Reading file listing"
 #~ msgstr "正在讀取檔案清單"
 
+#~ 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。如果您無法將此檔案還原，請清除檔案內容，然後立即"
+#~ "重新安裝同一版本的套件！"
+
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "無法讀取清單檔 %sinfo/%s"
+
+#~ msgid "Internal error getting a node"
+#~ msgstr "內部錯誤，無法取得節點"
+
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "讀取抽換檔 %sdiversions 失敗"
+
 #~ msgid "The diversion file is corrupted"
 #~ msgstr "抽換檔已損壞"
 
@@ -3374,6 +3421,12 @@ msgstr "未鎖定"
 #~ msgid "Internal error adding a diversion"
 #~ msgstr "內部錯誤：在新增抽換資料時發生錯誤"
 
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "套件快取必須先初始化"
+
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "找不到套件：檔案標頭，位移 %lu"
+
 #~ msgid "Bad ConfFile section in the status file. Offset %lu"
 #~ msgstr "在 status 檔中的 ConfFile 區段損壞。位移 %lu"
 
@@ -3383,119 +3436,94 @@ msgstr "未鎖定"
 #~ msgid "Couldn't change to %s"
 #~ msgstr "無法切換至 %s"
 
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "找不到可用的 control 檔"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "無法開啟管線給 %s 使用"
+
 #~ msgid "Read error from %s process"
 #~ msgstr "由 %s 程序讀取錯誤"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為："
-#~ "%lu。(man 5 apt.conf)"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "取得一個單行超過 %u 字元的標頭"
 
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "注意：已由 dpkg 按目的自動完成。"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #1"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "未有安裝 %s 套件，所以無法移除\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #2"
 
-#~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
-#~ msgstr ""
-#~ "用法: apt-mark [選項] {auto|manual} 套件1 [套件2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "指令:\n"
-#~ "   auto - 將給定套件標記為已自動安裝\n"
-#~ "   manual - 將給定套件標記為已手動安裝\n"
-#~ "\n"
-#~ "選項:\n"
-#~ "  -h  本說明文字.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? 讀取此設定檔案\n"
-#~ "  -o=? 設定任意設定選項, 如 -o dir::cache=/tmp\n"
-#~ "更多資訊見 apt-mark(8) 及 apt.conf(5) manual pages."
-
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "以 apt-get autoremove 將之移除。"
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "重新定義檔 %s 第 %lu 行的格式錯誤 #3"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "用法: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "選項:\n"
-#~ "  -h  本說明文字.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? 讀取本設定檔\n"
-#~ "  -o=? 設定任意設定選項, 如 -o dir::cache=/tmp\n"
-#~ "更多資訊及選項見 apt.conf(5) manual pages.\n"
-#~ "                       This APT has Super Cow Powers.\n"
+#~ msgid "decompressor"
+#~ msgstr "解壓縮程式"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "未能移除 %s"
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "讀取，仍有 %lu 未讀但已無空間"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "未能取得 %sinfo 的狀態"
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "寫入，仍有 %lu 待寫入但已沒辨法"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr "資料目錄與暫存目錄需位於同一檔案系統"
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewPackage)"
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "未能切換至管理者目錄 %sinfo"
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "在處理 %s 時發生錯誤 (UsePackage1)"
 
-#~ 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。如果您無法將此檔案還原，請清除檔案內容，然後立即"
-#~ "重新安裝同一版本的套件！"
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewFileDesc1)"
 
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "未能讀取清單檔 %sinfo/%s"
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "在處理 %s 時發生錯誤 (UsePackage2)"
 
-#~ msgid "Failed to find a Package: header, offset %lu"
-#~ msgstr "未能找到套件：檔案標頭，位移 %lu"
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewFileVer1)"
 
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "未能讀取抽換檔 %sdiversions"
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewVersion1)"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "未能找到有效的控制檔"
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "在處理 %s 時發生錯誤 (UsePackage3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewFileDesc2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "在處理 %s 時發生錯誤 (FindPkg)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)"
+
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "內部錯誤：無法找到成員"
+
+#, fuzzy
+#~ msgid "Release file expired, ignoring %s (invalid since %s)"
+#~ msgstr "Release 檔已過期，略過 %s（有效期限 %s）"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "在處理 %s 時發生錯誤 (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）"
+
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "無法存取鑰匙圈：'%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "無法修補檔案"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#~ msgid "Processing triggers for %s"
+#~ msgstr "正在進行 %s 的觸發程式"
diff --git a/test/integration/framework b/test/integration/framework
index bec321240..11f1c7be2 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -468,7 +468,7 @@ insertpackage() {
 	local PRIORITY="${6:-optional}"
 	local ARCHS=""
 	for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
-		if [ "$arch" = "all" ]; then
+		if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
 			ARCHS="$(getarchitectures)"
 		else
 			ARCHS="$arch"
@@ -482,9 +482,9 @@ insertpackage() {
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
-Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $arch
-Version: $VERSION
+Maintainer: Joe Sixpack <joe@example.org>" >> $FILE
+			test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
+			echo "Version: $VERSION
 Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
 			test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
 			echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
@@ -534,8 +534,8 @@ Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $arch
 Version: $VERSION" >> $FILE
+		test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
 		test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
 		echo "Description: an autogenerated dummy ${NAME}=${VERSION}/installed
  If you find such a package installed on your system,
@@ -828,7 +828,7 @@ testnopackage() {
 
 testdpkginstalled() {
 	msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
-	local PKGS="$(dpkg -l $* | grep '^i' | wc -l)"
+	local PKGS="$(dpkg -l $* 2>/dev/null | grep '^i' | wc -l)"
 	if [ "$PKGS" != $# ]; then
 		echo $PKGS
 		dpkg -l $* | grep '^[a-z]'
diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture
new file mode 100755
index 000000000..b2c9ec9ee
--- /dev/null
+++ b/test/integration/test-bug-686346-package-missing-architecture
@@ -0,0 +1,109 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64'
+
+insertinstalledpackage 'pkgb' 'none' '1'
+insertinstalledpackage 'pkgd' 'none' '1'
+insertpackage 'unstable' 'pkga' 'amd64' '2' 'Depends: pkgb'
+insertpackage 'unstable' 'pkgb' 'amd64' '2'
+insertpackage 'unstable' 'pkgc' 'amd64' '1' 'Conflicts: pkgb'
+insertpackage 'unstable' 'pkge' 'none' '1'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following packages will be REMOVED:
+  pkgb:none
+The following NEW packages will be installed:
+  pkgc
+0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
+Remv pkgb:none [1]
+Inst pkgc (1 unstable [amd64])
+Conf pkgc (1 unstable [amd64])' aptget install pkgc -s
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  pkgb
+The following packages will be REMOVED:
+  pkgb:none
+The following NEW packages will be installed:
+  pkga pkgb
+0 upgraded, 2 newly installed, 1 to remove and 0 not upgraded.
+Remv pkgb:none [1]
+Inst pkgb (2 unstable [amd64])
+Inst pkga (2 unstable [amd64])
+Conf pkgb (2 unstable [amd64])
+Conf pkga (2 unstable [amd64])' aptget install pkga -s
+
+# ensure that arch-less stanzas from Packages files are ignored
+msgtest 'Package is distributed in the Packages files' 'pkge'
+grep -q 'Package: pkge' $(find aptarchive -name 'Packages') && msgpass || msgfail
+testnopackage pkge
+testnopackage pkge:none
+testnopackage pkge:*
+
+# do not automatically change from none-arch to whatever-arch as
+# this breaks other none packages and dpkg has this ruleset as
+# this difference seems so important that it has to be maintained …
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade -s
+
+# pkgd has no update with an architecture
+testdpkginstalled pkgd
+msgtest 'Test apt-get purge' 'pkgd'
+aptget purge pkgd -y >/dev/null 2>&1 && msgpass || msgfail
+testdpkgnotinstalled pkgd
+
+# there is a pkgb with an architecture
+testdpkginstalled pkgb
+msgtest 'Test apt-get purge' 'pkgb:none'
+aptget purge pkgb:none -y >/dev/null 2>&1 && msgpass || msgfail
+testdpkgnotinstalled pkgb
+
+# check that dependencies are created after the none package exists in the cache
+rm rootdir/var/cache/apt/*.bin
+insertinstalledpackage 'pkgb' 'none' '1'
+insertinstalledpackage 'pkgf' 'none' '1' 'Conflicts: pkgb'
+insertinstalledpackage 'pkgg' 'amd64' '1' 'Conflicts: pkgb'
+insertinstalledpackage 'pkgb' 'amd64' '2'
+testequal "Reading package lists...
+Building dependency tree...
+Reading state information...
+You might want to run 'apt-get -f install' to correct these.
+The following packages have unmet dependencies:
+ pkgb : Conflicts: pkgb:none but 1 is installed
+ pkgb:none : Conflicts: pkgb but 2 is installed
+ pkgf:none : Conflicts: pkgb:none but 1 is installed
+             Conflicts: pkgb but 2 is installed
+ pkgg : Conflicts: pkgb but 2 is installed
+        Conflicts: pkgb:none but 1 is installed
+E: Unmet dependencies. Try using -f." aptget check
+
+# check that dependencies are generated for none-packages
+rm rootdir/var/lib/dpkg/status
+insertinstalledpackage 'pkgx' 'none' '1'
+insertinstalledpackage 'pkgy' 'none' '1' 'Depends: pkgz, pkgx (>= 1)'
+insertinstalledpackage 'pkgz' 'none' '1'
+testequal 'Reading package lists...
+Building dependency tree...
+Reading state information...
+The following packages will be REMOVED:
+  pkgx:none* pkgy:none*
+0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Purg pkgy:none [1]
+Purg pkgx:none [1]' aptget purge pkgx -s
+testequal 'Reading package lists...
+Building dependency tree...
+Reading state information...
+The following packages will be REMOVED:
+  pkgy:none* pkgz:none*
+0 upgraded, 0 newly installed, 2 to remove and 0 not upgraded.
+Purg pkgy:none [1]
+Purg pkgz:none [1]' aptget purge pkgz -s
diff --git a/test/integration/test-conflicts-real-multiarch-same b/test/integration/test-conflicts-real-multiarch-same
new file mode 100755
index 000000000..d9111677c
--- /dev/null
+++ b/test/integration/test-conflicts-real-multiarch-same
@@ -0,0 +1,50 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'amd64' 'i386'
+
+insertpackage 'unstable' 'virtual-provider' 'amd64,i386' '2' 'Provides: virtual
+Conflicts: virtual
+Multi-Arch: same'
+insertpackage 'unstable' 'real' 'amd64,i386' '2' 'Conflicts: real
+Multi-Arch: same'
+insertpackage 'unstable' 'real-provider' 'amd64,i386' '2' 'Provides: real-provider
+Conflicts: real-provider
+Multi-Arch: same'
+setupaptarchive
+
+testequal "Reading package lists...
+Building dependency tree...
+Note, selecting 'virtual-provider' instead of 'virtual'
+Note, selecting 'virtual-provider:i386' instead of 'virtual:i386'
+The following NEW packages will be installed:
+  virtual-provider virtual-provider:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst virtual-provider (2 unstable [amd64])
+Inst virtual-provider:i386 (2 unstable [i386])
+Conf virtual-provider (2 unstable [amd64])
+Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s -q=0
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  real real:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst real (2 unstable [amd64])
+Inst real:i386 (2 unstable [i386])
+Conf real (2 unstable [amd64])
+Conf real:i386 (2 unstable [i386])' aptget install real:* -s -q=0
+
+# ensure that we are not confused by the provides
+testequal 'Reading package lists...
+Building dependency tree...
+The following NEW packages will be installed:
+  real-provider real-provider:i386
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst real-provider (2 unstable [amd64])
+Inst real-provider:i386 (2 unstable [i386])
+Conf real-provider (2 unstable [amd64])
+Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s -q=0