fixed indentation issues

58 files changed, 3040 insertions, 883 deletions

diff --git a/.bzrignore b/.bzrignore
index 7c4b11b10..1fedc3e60 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -25,3 +25,13 @@ abicheck/tests/
 ./doc/*/
 !./doc/examples/
 !./doc/po/
+
+doc/po/apt-doc.pot
+doc/po/de.po
+doc/po/es.po
+doc/po/fr.po
+doc/po/it.po
+doc/po/ja.po
+doc/po/pl.po
+doc/po/pt.po
+doc/po/pt_BR.po
diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 1a358d57e..01b6b3836 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -336,7 +336,7 @@ bool ExtractTar::Go(pkgDirStream &Stream)
       }
       
       // And finish up
-      if (Itm.Size >= 0 && BadRecord == false)
+      if (BadRecord == false)
 	 if (Stream.FinishedFile(Itm,Fd) == false)
 	    return false;
       
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2e36e1f2c..b85e5d19b 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -271,6 +271,14 @@ void pkgAcqSubIndex::Done(string Message,unsigned long Size,string Md5Hash,	/*{{
 
    string FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(Desc.URI);
 
+   /* Downloaded invalid transindex => Error (LP: #346386) (Closes: #627642) */
+   indexRecords SubIndexParser;
+   if (FileExists(DestFile) == true && !SubIndexParser.Load(DestFile)) {
+      Status = StatError;
+      ErrorText = SubIndexParser.ErrorText;
+      return;
+   }
+
    // sucess in downloading the index
    // rename the index
    if(Debug)
@@ -579,6 +587,7 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner,
    : Item(Owner), RealURI(URI), ExpectedHash(ExpectedHash), 
      available_patches(diffs), ServerSha1(ServerSha1)
 {
+   
    DestFile = _config->FindDir("Dir::State::lists") + "partial/";
    DestFile += URItoFileName(URI);
 
@@ -715,6 +724,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,	/*
    // sucess in downloading a diff, enter ApplyDiff state
    if(State == StateFetchDiff)
    {
+
       // rred excepts the patch as $FinalFile.ed
       Rename(DestFile,FinalFile+".ed");
       std::clog << "    Sending to rred method FinalFile: " << FinalFile << std::endl;
@@ -729,6 +739,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,	/*
       return;
    } 
 
+
    // success in download/apply a diff, queue next (if needed)
    if(State == StateApplyDiff)
    {
@@ -891,6 +902,30 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
 	 ReportMirrorFailure("HashChecksumFailure");
          return;
       }
+
+      /* Verify the index file for correctness (all indexes must
+       * have a Package field) (LP: #346386) (Closes: #627642) */
+      {
+	 FileFd fd(DestFile, FileFd::ReadOnly);
+	 pkgTagSection sec;
+	 pkgTagFile tag(&fd);
+
+         // Only test for correctness if the file is not empty (empty is ok)
+         if (fd.Size() > 0) {
+            if (_error->PendingError() || !tag.Step(sec)) {
+               Status = StatError;
+               _error->DumpErrors();
+               Rename(DestFile,DestFile + ".FAILED");
+               return;
+            } else if (!sec.Exists("Package")) {
+               Status = StatError;
+               ErrorText = ("Encountered a section with no Package: header");
+               Rename(DestFile,DestFile + ".FAILED");
+               return;
+            }
+         }
+      }
+       
       // Done, move it into position
       string FinalFile = _config->FindDir("Dir::State::lists");
       FinalFile += URItoFileName(RealURI);
@@ -1327,6 +1362,16 @@ void pkgAcqMetaIndex::AuthDone(string Message)				/*{{{*/
 									/*}}}*/
 void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 {
+#if 0
+   /* Reject invalid, existing Release files (LP: #346386) (Closes: #627642)
+    * FIXME: Disabled; it breaks unsigned repositories without hashes */
+   if (!verify && FileExists(DestFile) && !MetaIndexParser->Load(DestFile))
+   {
+      Status = StatError;
+      ErrorText = MetaIndexParser->ErrorText;
+      return;
+   }
+#endif
    for (vector <struct IndexTarget*>::const_iterator Target = IndexTargets->begin();
         Target != IndexTargets->end();
         Target++)
@@ -1428,8 +1473,10 @@ bool pkgAcqMetaIndex::VerifyVendor(string Message)			/*{{{*/
 	 // TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 	 // the time since then the file is invalid - formated in the same way as in
 	 // the download progress display (e.g. 7d 3h 42min 1s)
-	 return _error->Error(_("Release file expired, ignoring %s (invalid since %s)"),
-	                      RealURI.c_str(), TimeToStr(invalid_since).c_str());
+	 return _error->Error(
+            _("Release file for %s is expired (invalid since %s). "
+              "Updates for this repository will not be applied."),
+            RealURI.c_str(), TimeToStr(invalid_since).c_str());
    }
 
    if (_config->FindB("Debug::pkgAcquire::Auth", false)) 
@@ -1490,6 +1537,12 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf)
 			 LookupTag(Message,"Message").c_str());
 	 RunScripts("APT::Update::Auth-Failure");
 	 return;
+      } else if (LookupTag(Message,"Message").find("NODATA") != string::npos) {
+	 /* Invalid signature file, reject (LP: #346386) (Closes: #627642) */
+	 _error->Error(_("GPG error: %s: %s"),
+			 Desc.Description.c_str(),
+			 LookupTag(Message,"Message").c_str());
+	 return;
       } else {
 	 _error->Warning(_("GPG error: %s: %s"),
 			 Desc.Description.c_str(),
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index eb1e003c2..e9e102488 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -323,12 +323,13 @@ int pkgAcqMethod::Run(bool Single)
       if (Single == true && Messages.empty() == true)
 	 return -1;
       
-      string m = Messages.front();
+      string Message = Messages.front();
       Messages.erase(Messages.begin());
+      
       // Fetch the message number
       char *End;
-      int Number = strtol(m.c_str(),&End,10);
-      if (End == m.c_str())
+      int Number = strtol(Message.c_str(),&End,10);
+      if (End == Message.c_str())
       {	 
 	 cerr << "Malformed message!" << endl;
 	 return 100;
@@ -337,19 +338,20 @@ int pkgAcqMethod::Run(bool Single)
       switch (Number)
       {	 
 	 case 601:
-	    if (Configuration(m) == false)
-	       return 100;
+	 if (Configuration(Message) == false)
+	    return 100;
 	 break;
 	 
 	 case 600:
 	 {
 	    FetchItem *Tmp = new FetchItem;
-	    Tmp->Uri = LookupTag(m,"URI");
-	    Tmp->DestFile = LookupTag(m,"FileName");
-	    if (RFC1123StrToTime(LookupTag(m,"Last-Modified").c_str(),Tmp->LastModified) == false)
+	    
+	    Tmp->Uri = LookupTag(Message,"URI");
+	    Tmp->DestFile = LookupTag(Message,"FileName");
+	    if (RFC1123StrToTime(LookupTag(Message,"Last-Modified").c_str(),Tmp->LastModified) == false)
 	       Tmp->LastModified = 0;
-	    Tmp->IndexFile = StringToBool(LookupTag(m,"Index-File"),false);
-	    Tmp->FailIgnore = StringToBool(LookupTag(m,"Fail-Ignore"),false);
+	    Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false);
+	    Tmp->FailIgnore = StringToBool(LookupTag(Message,"Fail-Ignore"),false);
 	    Tmp->Next = 0;
 	    
 	    // Append it to the list
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 2dae4258a..7c911b865 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -1176,6 +1176,31 @@ bool pkgProblemResolver::Resolve(bool BrokenFix)
    return true;
 }
 									/*}}}*/
+
+// ProblemResolver::BreaksInstOrPolicy - Check if the given pkg is broken/*{{{*/
+// ---------------------------------------------------------------------
+/* This checks if the given package is broken either by a hard dependency
+   (InstBroken()) or by introducing a new policy breakage e.g. new
+   unsatisfied recommends for a package that was in "policy-good" state
+
+   Note that this is not perfect as it will ignore further breakage
+   for already broken policy (recommends)
+*/
+bool pkgProblemResolver::InstOrNewPolicyBroken(pkgCache::PkgIterator I)
+{
+   
+   // a broken install is always a problem
+   if (Cache[I].InstBroken() == true)
+      return true;
+
+   // a newly broken policy (recommends/suggests) is a problem
+   if (Cache[I].NowPolicyBroken() == false &&
+       Cache[I].InstPolicyBroken() == true)
+      return true;
+       
+   return false;
+}
+
 // ProblemResolver::ResolveByKeep - Resolve problems using keep		/*{{{*/
 // ---------------------------------------------------------------------
 /* This is the work horse of the soft upgrade routine. It is very gental 
@@ -1220,9 +1245,12 @@ bool pkgProblemResolver::ResolveByKeep()
    {
       pkgCache::PkgIterator I(Cache,*K);
 
-      if (Cache[I].InstallVer == 0 || Cache[I].InstBroken() == false)
+      if (Cache[I].InstallVer == 0)
 	 continue;
 
+      if (InstOrNewPolicyBroken(I) == false)
+         continue;
+
       /* Keep the package. If this works then great, otherwise we have
        	 to be significantly more agressive and manipulate its dependencies */
       if ((Flags[I->ID] & Protected) == 0)
@@ -1230,7 +1258,7 @@ bool pkgProblemResolver::ResolveByKeep()
 	 if (Debug == true)
 	    clog << "Keeping package " << I.FullName(false) << endl;
 	 Cache.MarkKeep(I, false, false);
-	 if (Cache[I].InstBroken() == false)
+	 if (InstOrNewPolicyBroken(I) == false)
 	 {
 	    K = PList - 1;
 	    continue;
@@ -1280,11 +1308,11 @@ bool pkgProblemResolver::ResolveByKeep()
 		  Cache.MarkKeep(Pkg, false, false);
 	       }
 	       
-	       if (Cache[I].InstBroken() == false)
+	       if (InstOrNewPolicyBroken(I) == false)
 		  break;
 	    }
 	    
-	    if (Cache[I].InstBroken() == false)
+	    if (InstOrNewPolicyBroken(I) == false)
 	       break;
 
 	    if (Start == End)
@@ -1292,11 +1320,11 @@ bool pkgProblemResolver::ResolveByKeep()
 	    Start++;
 	 }
 	      
-	 if (Cache[I].InstBroken() == false)
+	 if (InstOrNewPolicyBroken(I) == false)
 	    break;
       }
 
-      if (Cache[I].InstBroken() == true)
+      if (InstOrNewPolicyBroken(I) == true)
 	 continue;
       
       // Restart again.
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index ebe31cc10..99501bed1 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -106,6 +106,9 @@ class pkgProblemResolver						/*{{{*/
    void MakeScores();
    bool DoUpgrade(pkgCache::PkgIterator Pkg);
    
+   protected:
+   bool InstOrNewPolicyBroken(pkgCache::PkgIterator Pkg);
+
    public:
    
    inline void Protect(pkgCache::PkgIterator Pkg) {Flags[Pkg->ID] |= Protected; Cache.MarkProtected(Pkg);};
diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc
index ca602d4bf..e8c8e73d0 100644
--- a/apt-pkg/aptconfiguration.cc
+++ b/apt-pkg/aptconfiguration.cc
@@ -224,7 +224,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All,
 		environment.push_back("en");
 	}
 
-	// Support settings like Acquire::Translation=none on the command line to
+	// Support settings like Acquire::Languages=none on the command line to
 	// override the configuration settings vector of languages.
 	string const forceLang = _config->Find("Acquire::Languages","");
 	if (forceLang.empty() == false) {
diff --git a/apt-pkg/aptconfiguration.h b/apt-pkg/aptconfiguration.h
index 815db6cae..1f0399dd2 100644
--- a/apt-pkg/aptconfiguration.h
+++ b/apt-pkg/aptconfiguration.h
@@ -36,7 +36,7 @@ public:									/*{{{*/
 	 *  \param Cached saves the result so we need to calculated it only once
 	 *                this parameter should ony be used for testing purposes.
 	 *
-	 *  \return a vector of (all) Language Codes in the prefered usage order
+	 *  \return a vector of the compression types in the prefered usage order
 	 */
 	std::vector<std::string> static const getCompressionTypes(bool const &Cached = true);
 
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index cc7093fe2..942ea9fbc 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -318,6 +318,19 @@ void Configuration::CndSet(const char *Name,const string &Value)
       Itm->Value = Value;
 }
 									/*}}}*/
+// Configuration::Set - Set an integer value				/*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void Configuration::CndSet(const char *Name,int const Value)
+{
+   Item *Itm = Lookup(Name,true);
+   if (Itm == 0 || Itm->Value.empty() == false)
+      return;
+   char S[300];
+   snprintf(S,sizeof(S),"%i",Value);
+   Itm->Value = S;
+}
+									/*}}}*/
 // Configuration::Set - Set a value					/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index 71e5a0e47..2844ec097 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -82,6 +82,7 @@ class Configuration
 	      
    inline void Set(const string &Name,const string &Value) {Set(Name.c_str(),Value);};
    void CndSet(const char *Name,const string &Value);
+   void CndSet(const char *Name,const int Value);
    void Set(const char *Name,const string &Value);
    void Set(const char *Name,const int &Value);
    
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 0b7d91d3b..f65f7cf28 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -148,8 +148,7 @@ bool CopyFile(FileFd &From,FileFd &To)
 
    return true;   
 }
-
-/*}}}*/
+									/*}}}*/
 // GetLock - Gets a lock file						/*{{{*/
 // ---------------------------------------------------------------------
 /* This will create an empty file of the given name and lock it. Once this
@@ -617,6 +616,7 @@ bool WaitFd(int Fd,bool write,unsigned long timeout)
       if (Res <= 0)
 	 return false;
    }
+   
    return true;
 }
 									/*}}}*/
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 4f549b7db..057a99a86 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -429,12 +429,10 @@ string debTranslationsIndex::IndexURI(const char *Type) const
 /* */
 bool debTranslationsIndex::GetIndexes(pkgAcquire *Owner) const
 {
-   if (TranslationsAvailable()) {
-     string const TranslationFile = string("Translation-").append(Language);
-     new pkgAcqIndexTrans(Owner, IndexURI(Language),
-			  Info(TranslationFile.c_str()),
-			  TranslationFile);
-   }
+   string const TranslationFile = string("Translation-").append(Language);
+   new pkgAcqIndexTrans(Owner, IndexURI(Language),
+                        Info(TranslationFile.c_str()),
+                        TranslationFile);
 
    return true;
 }
@@ -474,9 +472,6 @@ string debTranslationsIndex::Info(const char *Type) const
 									/*}}}*/
 bool debTranslationsIndex::HasPackages() const				/*{{{*/
 {
-   if(!TranslationsAvailable())
-      return false;
-   
    return FileExists(IndexFile(Language));
 }
 									/*}}}*/
@@ -516,7 +511,7 @@ bool debTranslationsIndex::Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const
 {
    // Check the translation file, if in use
    string TranslationFile = IndexFile(Language);
-   if (TranslationsAvailable() && FileExists(TranslationFile))
+   if (FileExists(TranslationFile))
    {
      FileFd Trans(TranslationFile,FileFd::ReadOnlyGzip);
      debListParser TransParser(&Trans);
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index b59ae8896..9ae1065a4 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -201,7 +201,7 @@ string debListParser::DescriptionLanguage()
    if (Section.FindS("Description").empty() == false)
       return "";
 
-   std::vector<string> const lang = APT::Configuration::getLanguages();
+   std::vector<string> const lang = APT::Configuration::getLanguages(true);
    for (std::vector<string>::const_iterator l = lang.begin();
 	l != lang.end(); l++)
       if (Section.FindS(string("Description-").append(*l).c_str()).empty() == false)
@@ -284,18 +284,18 @@ unsigned short debListParser::VersionHash()
       /* Strip out any spaces from the text, this undoes dpkgs reformatting
          of certain fields. dpkg also has the rather interesting notion of
          reformatting depends operators < -> <= */
-      char *I = S;
+      char *J = S;
       for (; Start != End; Start++)
       {
 	 if (isspace(*Start) == 0)
-	    *I++ = tolower_ascii(*Start);
+	    *J++ = tolower_ascii(*Start);
 	 if (*Start == '<' && Start[1] != '<' && Start[1] != '=')
-	    *I++ = '=';
+	    *J++ = '=';
 	 if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
-	    *I++ = '=';
+	    *J++ = '=';
       }
 
-      Result = AddCRC16(Result,S,I - S);
+      Result = AddCRC16(Result,S,J - S);
    }
    
    return Result;
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b37980b7e..5fbd1801a 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -14,8 +14,8 @@
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/strutl.h>
-#include <apti18n.h>
 #include <apt-pkg/fileutl.h>
+#include <apt-pkg/cachefile.h>
 
 #include <unistd.h>
 #include <stdlib.h>
@@ -32,6 +32,8 @@
 #include <algorithm>
 #include <sstream>
 #include <map>
+#include <pwd.h>
+#include <grp.h>
 
 #include <termios.h>
 #include <unistd.h>
@@ -667,7 +669,13 @@ bool pkgDPkgPM::OpenLog()
 	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());
       setvbuf(term_out, NULL, _IONBF, 0);
       SetCloseExec(fileno(term_out), true);
-      chmod(logfile_name.c_str(), 0600);
+      struct passwd *pw;
+      struct group *gr;
+      pw = getpwnam("root");
+      gr = getgrnam("adm");
+      if (pw != NULL && gr != NULL)
+	  chown(logfile_name.c_str(), pw->pw_uid, gr->gr_gid);
+      chmod(logfile_name.c_str(), 0644);
       fprintf(term_out, "\nLog started: %s\n", timestr);
    }
 
@@ -681,31 +689,42 @@ bool pkgDPkgPM::OpenLog()
 	 return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());
       chmod(history_name.c_str(), 0644);
       fprintf(history_out, "\nStart-Date: %s\n", timestr);
-      string remove, purge, install, upgrade, downgrade;
+      string remove, purge, install, reinstall, upgrade, downgrade;
       for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++)
       {
-	 if (Cache[I].NewInstall())
-	 {
-	    install += I.FullName(false) + string(" (") + Cache[I].CandVersion;
-	    if (Cache[I].Flags & pkgCache::Flag::Auto)
-	       install+= ", automatic";
-	    install += string("), ");
-	 }
-	 else if (Cache[I].Upgrade())
-	    upgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
-	 else if (Cache[I].Downgrade())
-	    downgrade += I.FullName(false) + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), ");
-	 else if (Cache[I].Delete())
-	 {
-	    if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge)
-	       purge += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");	    
-	    else
-	       remove += I.FullName(false) + string(" (") + Cache[I].CurVersion + string("), ");	    
+	 enum { CANDIDATE, CANDIDATE_AUTO, CURRENT_CANDIDATE, CURRENT } infostring;
+	 string *line = NULL;
+	 #define HISTORYINFO(X, Y) { line = &X; infostring = Y; }
+	 if (Cache[I].NewInstall() == true)
+	    HISTORYINFO(install, CANDIDATE_AUTO)
+	 else if (Cache[I].ReInstall() == true)
+	    HISTORYINFO(reinstall, CANDIDATE)
+	 else if (Cache[I].Upgrade() == true)
+	    HISTORYINFO(upgrade, CURRENT_CANDIDATE)
+	 else if (Cache[I].Downgrade() == true)
+	    HISTORYINFO(downgrade, CURRENT_CANDIDATE)
+	 else if (Cache[I].Delete() == true)
+	    HISTORYINFO((Cache[I].Purge() ? purge : remove), CURRENT)
+	 else
+	    continue;
+	 #undef HISTORYINFO
+	 line->append(I.FullName(false)).append(" (");
+	 switch (infostring) {
+	 case CANDIDATE: line->append(Cache[I].CandVersion); break;
+	 case CANDIDATE_AUTO:
+	    line->append(Cache[I].CandVersion);
+	    if ((Cache[I].Flags & pkgCache::Flag::Auto) == pkgCache::Flag::Auto)
+	       line->append(", automatic");
+	    break;
+	 case CURRENT_CANDIDATE: line->append(Cache[I].CurVersion).append(", ").append(Cache[I].CandVersion); break;
+	 case CURRENT: line->append(Cache[I].CurVersion); break;
 	 }
+	 line->append("), ");
       }
       if (_config->Exists("Commandline::AsString") == true)
 	 WriteHistoryTag("Commandline", _config->Find("Commandline::AsString"));
       WriteHistoryTag("Install", install);
+      WriteHistoryTag("Reinstall", reinstall);
       WriteHistoryTag("Upgrade", upgrade);
       WriteHistoryTag("Downgrade",downgrade);
       WriteHistoryTag("Remove",remove);
@@ -1269,6 +1288,23 @@ bool pkgDPkgPM::Go(int OutStatusFd)
    if (RunScripts("DPkg::Post-Invoke") == false)
       return false;
 
+   if (_config->FindB("Debug::pkgDPkgPM",false) == false)
+   {
+      std::string const oldpkgcache = _config->FindFile("Dir::cache::pkgcache");
+      if (oldpkgcache.empty() == false && RealFileExists(oldpkgcache) == true &&
+	  unlink(oldpkgcache.c_str()) == 0)
+      {
+	 std::string const srcpkgcache = _config->FindFile("Dir::cache::srcpkgcache");
+	 if (srcpkgcache.empty() == false && RealFileExists(srcpkgcache) == true)
+	 {
+	    _error->PushToStack();
+	    pkgCacheFile CacheFile;
+	    CacheFile.BuildCaches(NULL, true);
+	    _error->RevertToStack();
+	 }
+      }
+   }
+
    Cache.writeStateFile(NULL);
    return true;
 }
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index e9fa097aa..eb3f4e598 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1593,7 +1593,7 @@ bool pkgDepCache::MarkFollowsRecommends()
 
 bool pkgDepCache::MarkFollowsSuggests()
 {
-  return _config->FindB("APT::AutoRemove::SuggestsImportant", false);
+  return _config->FindB("APT::AutoRemove::SuggestsImportant", true);
 }
 
 // pkgDepCache::MarkRequired - the main mark algorithm			/*{{{*/
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 750da3d6f..9efe110f5 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -231,6 +231,7 @@ class pkgDepCache : protected pkgCache::Namespace
       // Various test members for the current status of the package
       inline bool NewInstall() const {return Status == 2 && Mode == ModeInstall;};
       inline bool Delete() const {return Mode == ModeDelete;};
+      inline bool Purge() const {return Delete() == true && (iFlags & pkgDepCache::Purge) == pkgDepCache::Purge; };
       inline bool Keep() const {return Mode == ModeKeep;};
       inline bool Upgrade() const {return Status > 0 && Mode == ModeInstall;};
       inline bool Upgradable() const {return Status >= 1;};
@@ -241,6 +242,7 @@ class pkgDepCache : protected pkgCache::Namespace
       inline bool InstBroken() const {return (DepState & DepInstMin) != DepInstMin;};
       inline bool InstPolicyBroken() const {return (DepState & DepInstPolicy) != DepInstPolicy;};
       inline bool Install() const {return Mode == ModeInstall;};
+      inline bool ReInstall() const {return Delete() == false && (iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall;};
       inline VerIterator InstVerIter(pkgCache &Cache)
                 {return VerIterator(Cache,InstallVer);};
       inline VerIterator CandidateVerIter(pkgCache &Cache)
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 064fb007c..31c577705 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -664,6 +664,21 @@ bool SigVerify::CopyAndVerify(string CDROM,string Name,vector<string> &SigList,
 bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
 			int const &statusfd, int fd[2])
 {
+   if (File == FileGPG)
+   {
+      #define SIGMSG "-----BEGIN PGP SIGNED MESSAGE-----\n"
+      char buffer[sizeof(SIGMSG)];
+      FILE* gpg = fopen(File.c_str(), "r");
+      if (gpg == NULL)
+	 return _error->Errno("RunGPGV", _("Could not open file %s"), File.c_str());
+      char const * const test = fgets(buffer, sizeof(buffer), gpg);
+      fclose(gpg);
+      if (test == NULL || strcmp(buffer, SIGMSG) != 0)
+	 return _error->Error(_("File %s doesn't start with a clearsigned message"), File.c_str());
+      #undef SIGMSG
+   }
+
+
    string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
    // FIXME: remove support for deprecated APT::GPGV setting
    string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
@@ -688,7 +703,11 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
    Args.reserve(30);
 
    if (keyrings.empty() == true)
-      return false;
+   {
+      // TRANSLATOR: %s is the trusted keyring parts directory
+      return _error->Error(_("No keyring installed in %s."),
+			   _config->FindDir("Dir::Etc::TrustedParts").c_str());
+   }
 
    Args.push_back(gpgvpath.c_str());
    Args.push_back("--ignore-time-conflict");
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 0bb106ac8..4d2eae913 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -33,66 +33,67 @@ const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
 bool pkgInitConfig(Configuration &Cnf)
 {
    // General APT things
-   Cnf.Set("APT::Architecture", COMMON_ARCH);
-   Cnf.Set("APT::Build-Essential::", "build-essential");
-   Cnf.Set("APT::Install-Recommends", true);
-   Cnf.Set("APT::Install-Suggests", false);
-   Cnf.Set("Dir","/");
+   Cnf.CndSet("APT::Architecture", COMMON_ARCH);
+   if (Cnf.Exists("APT::Build-Essential") == false)
+      Cnf.Set("APT::Build-Essential::", "build-essential");
+   Cnf.CndSet("APT::Install-Recommends", true);
+   Cnf.CndSet("APT::Install-Suggests", false);
+   Cnf.CndSet("Dir","/");
    
    // Debdelta replacement rule
    Cnf.Set("Aquire::Debdelta::Replace-Rule::Default", "http://debdeltas.debian.net/debian-deltas/");// http://www.bononia.it/debian-deltas/
    Cnf.Set("Aquire::Debdelta::Replace-Rule::http://security.debian.org/", "http://debdeltas.debian.net/debian-security-deltas/"); // http://security.ubuntu.com/ubuntu/  => http://www.bononia.it/debian-security-deltas/ 
    // State   
-   Cnf.Set("Dir::State","var/lib/apt/");
+   Cnf.CndSet("Dir::State","var/lib/apt/");
    
    /* Just in case something goes horribly wrong, we can fall back to the
       old /var/state paths.. */
    struct stat St;   
    if (stat("/var/lib/apt/.",&St) != 0 &&
        stat("/var/state/apt/.",&St) == 0)
-      Cnf.Set("Dir::State","var/state/apt/");
+      Cnf.CndSet("Dir::State","var/state/apt/");
        
-   Cnf.Set("Dir::State::lists","lists/");
-   Cnf.Set("Dir::State::cdroms","cdroms.list");
-   Cnf.Set("Dir::State::mirrors","mirrors/");
+   Cnf.CndSet("Dir::State::lists","lists/");
+   Cnf.CndSet("Dir::State::cdroms","cdroms.list");
+   Cnf.CndSet("Dir::State::mirrors","mirrors/");
 
    // Cache
-   Cnf.Set("Dir::Cache","var/cache/apt/");
-   Cnf.Set("Dir::Cache::archives","archives/");
-   Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
-   Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
+   Cnf.CndSet("Dir::Cache","var/cache/apt/");
+   Cnf.CndSet("Dir::Cache::archives","archives/");
+   Cnf.CndSet("Dir::Cache::srcpkgcache","srcpkgcache.bin");
+   Cnf.CndSet("Dir::Cache::pkgcache","pkgcache.bin");
    
    // Configuration
-   Cnf.Set("Dir::Etc","etc/apt/");
-   Cnf.Set("Dir::Etc::sourcelist","sources.list");
-   Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
-   Cnf.Set("Dir::Etc::vendorlist","vendors.list");
-   Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
-   Cnf.Set("Dir::Etc::main","apt.conf");
-   Cnf.Set("Dir::Etc::netrc", "auth.conf");
-   Cnf.Set("Dir::Etc::parts","apt.conf.d");
-   Cnf.Set("Dir::Etc::preferences","preferences");
-   Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
-   Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
-   Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
-   Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods"); // /home/ishan/devel/apt/my/experiments/debian-sid/bin/methods
-   Cnf.Set("Dir::Media::MountPath","/media/apt");
+   Cnf.CndSet("Dir::Etc","etc/apt/");
+   Cnf.CndSet("Dir::Etc::sourcelist","sources.list");
+   Cnf.CndSet("Dir::Etc::sourceparts","sources.list.d");
+   Cnf.CndSet("Dir::Etc::vendorlist","vendors.list");
+   Cnf.CndSet("Dir::Etc::vendorparts","vendors.list.d");
+   Cnf.CndSet("Dir::Etc::main","apt.conf");
+   Cnf.CndSet("Dir::Etc::netrc", "auth.conf");
+   Cnf.CndSet("Dir::Etc::parts","apt.conf.d");
+   Cnf.CndSet("Dir::Etc::preferences","preferences");
+   Cnf.CndSet("Dir::Etc::preferencesparts","preferences.d");
+   Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg");
+   Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d");
+   Cnf.CndSet("Dir::Bin::methods","/usr/lib/apt/methods");
+   Cnf.CndSet("Dir::Media::MountPath","/media/apt");
 
    // State   
-   Cnf.Set("Dir::Log","var/log/apt");
-   Cnf.Set("Dir::Log::Terminal","term.log");
-   Cnf.Set("Dir::Log::History","history.log");
+   Cnf.CndSet("Dir::Log","var/log/apt");
+   Cnf.CndSet("Dir::Log::Terminal","term.log");
+   Cnf.CndSet("Dir::Log::History","history.log");
 
-   Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
-   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
-   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
-   Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
-
-   // Translation
-   Cnf.Set("APT::Acquire::Translation", "environment");
+   if (Cnf.Exists("Dir::Ignore-Files-Silently") == false)
+   {
+      Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
+      Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
+      Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
+      Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+   }
 
    // Default cdrom mount point
-   Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");
+   Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
 
    bool Res = true;
    
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index ba43bc757..19661fc2d 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -1073,6 +1073,12 @@ bool pkgOrderList::CheckDep(DepIterator D)
          just needs one */
       if (D.IsNegative() == false)
       {
+	 // ignore provides by older versions of this package
+	 if (((D.Reverse() == false && Pkg == D.ParentPkg()) ||
+	      (D.Reverse() == true && Pkg == D.TargetPkg())) &&
+	     Cache[Pkg].InstallVer != *I)
+	    continue;
+
 	 /* Try to find something that does not have the after flag set
 	    if at all possible */
 	 if (IsFlag(Pkg,After) == true)
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 9820fde81..8f9737e26 100644
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -1169,16 +1169,32 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
    SPtr<DynamicMMap> Map;
    if (Writeable == true && CacheFile.empty() == false)
    {
+      _error->PushToStack();
       unlink(CacheFile.c_str());
       CacheF = new FileFd(CacheFile,FileFd::WriteAtomic);
       fchmod(CacheF->Fd(),0644);
       Map = CreateDynamicMMap(CacheF, MMap::Public);
       if (_error->PendingError() == true)
-	 return false;
-      if (Debug == true)
+      {
+	 delete CacheF.UnGuard();
+	 delete Map.UnGuard();
+	 if (Debug == true)
+	    std::clog << "Open filebased MMap FAILED" << std::endl;
+	 Writeable = false;
+	 if (AllowMem == false)
+	 {
+	    _error->MergeWithStack();
+	    return false;
+	 }
+	 _error->RevertToStack();
+      }
+      else if (Debug == true)
+      {
+	 _error->MergeWithStack();
 	 std::clog << "Open filebased MMap" << std::endl;
+      }
    }
-   else
+   if (Writeable == false || CacheFile.empty() == true)
    {
       // Just build it in memory..
       Map = CreateDynamicMMap(NULL);
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 2cc2e5e39..bd213e0ce 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -210,13 +210,20 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
 {
    if (Name.empty() == true)
    {
-      Pin *P = &*Defaults.insert(Defaults.end(),PkgPin());
+      Pin *P = &*Defaults.insert(Defaults.end(),Pin());
       P->Type = Type;
       P->Priority = Priority;
       P->Data = Data;
       return;
    }
-   
+
+   size_t found = Name.rfind(':');
+   string Arch;
+   if (found != string::npos) {
+      Arch = Name.substr(found+1);
+      Name.erase(found);
+   }
+
    // Allow pinning by wildcards
    // TODO: Maybe we should always prefer specific pins over non-
    // specific ones.
@@ -225,32 +232,49 @@ void pkgPolicy::CreatePin(pkgVersionMatch::MatchType Type,string Name,
       pkgVersionMatch match(Data, Type);
       for (pkgCache::GrpIterator G = Cache->GrpBegin(); G.end() != true; ++G)
 	 if (match.ExpressionMatches(Name, G.Name()))
-	    CreatePin(Type, G.Name(), Data, Priority);
+	 {
+	    if (Arch.empty() == false)
+	       CreatePin(Type, string(G.Name()).append(":").append(Arch), Data, Priority);
+	    else
+	       CreatePin(Type, G.Name(), Data, Priority);
+	 }
       return;
    }
 
-   // Get a spot to put the pin
-   pkgCache::GrpIterator Grp = Cache->FindGrp(Name);
-   for (pkgCache::PkgIterator Pkg = Grp.PackageList();
-	Pkg.end() != true; Pkg = Grp.NextPkg(Pkg))
+   // 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();
+   }
+
+   if (Pkg.end() == true)
    {
-      Pin *P = 0;
-      if (Pkg.end() == false)
-	 P = Pins + Pkg->ID;
-      else
-      {
-	 // Check the unmatched table
-	 for (vector<PkgPin>::iterator I = Unmatched.begin();
-	      I != Unmatched.end() && P == 0; I++)
-	    if (I->Pkg == Name)
-	       P = &*I;
+      PkgPin *P = &*Unmatched.insert(Unmatched.end(),PkgPin(Name));
+      if (Arch.empty() == false)
+	 P->Pkg.append(":").append(Arch);
+      P->Type = Type;
+      P->Priority = Priority;
+      P->Data = Data;
+      return;
+   }
 
-	 if (P == 0)
-	    P = &*Unmatched.insert(Unmatched.end(),PkgPin());
-      }
+   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;
    }
 }
 									/*}}}*/
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index f8b2678de..a5e6c6048 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -55,6 +55,7 @@ class pkgPolicy : public pkgDepCache::Policy
    struct PkgPin : Pin
    {
       string Pkg;
+      PkgPin(string const &Pkg) : Pin(), Pkg(Pkg) {};
    };
    
    Pin *Pins;
diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index 9919a9c94..589ee7ada 100644
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -20,6 +20,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/init.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/aptconfiguration.h>
 
 #include <config.h>
 #include <apti18n.h>
@@ -27,6 +29,7 @@
 #include <locale.h>
 #include <iostream>
 #include <string>
+#include <vector>
 									/*}}}*/
 using namespace std;
 
@@ -119,6 +122,16 @@ int main(int argc,const char *argv[])					/*{{{*/
        CmdL.FileSize() == 0)
       return ShowHelp();
 
+   std::vector<std::string> const langs = APT::Configuration::getLanguages(true);
+   _config->Clear("Acquire::Languages");
+   for (std::vector<std::string>::const_iterator l = langs.begin(); l != langs.end(); ++l)
+      _config->Set("Acquire::Languages::", *l);
+
+   std::vector<std::string> const archs = APT::Configuration::getArchitectures();
+   _config->Clear("APT::Architectures");
+   for (std::vector<std::string>::const_iterator a = archs.begin(); a != archs.end(); ++a)
+      _config->Set("APT::Architectures::", *a);
+
    // Match the operation
    CmdL.DispatchArg(Cmds);
    
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 369dac1cf..0da3965be 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1697,7 +1697,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
 
    // we could have removed a new dependency of a garbage package,
    // so check if a reverse depends is broken and if so install it again.
-   if (tooMuch.empty() == false && Cache->BrokenCount() != 0)
+   if (tooMuch.empty() == false && (Cache->BrokenCount() != 0 || Cache->PolicyBrokenCount() != 0))
    {
       bool Changed;
       do {
@@ -1708,8 +1708,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
 	    for (pkgCache::DepIterator R = P.RevDependsList();
 		 R.end() == false; ++R)
 	    {
-	       if (R->Type != pkgCache::Dep::Depends &&
-		   R->Type != pkgCache::Dep::PreDepends)
+	       if (R.IsNegative() == true ||
+		   Cache->IsImportantDep(R) == false)
 		  continue;
 	       pkgCache::PkgIterator N = R.ParentPkg();
 	       if (N.end() == true || (N->CurrentVer == 0 && (*Cache)[N].Install() == false))
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 3838fafcd..843163f82 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -21,6 +21,13 @@ ARCHIVE_KEYRING_URI=""
 ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
 REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
+requires_root() {
+	if [ "$(id -u)" -ne 0 ]; then
+		echo >&1 "ERROR: This command can only be used by root."
+		exit 1
+	fi
+}
+
 add_keys_with_verify_against_master_keyring() {
     ADD_KEYRING=$1
     MASTER=$2
@@ -59,13 +66,14 @@ add_keys_with_verify_against_master_keyring() {
 # (otherwise it does not make sense from a security POV)
 net_update() {
     if [ -z "$ARCHIVE_KEYRING_URI" ]; then
-	echo "ERROR: no location for the archive-keyring given"
+	echo >&2 "ERROR: Your distribution is not supported in net-update as no uri for the archive-keyring is set"
 	exit 1
     fi
+    requires_root
     # in theory we would need to depend on wget for this, but this feature
     # isn't useable in debian anyway as we have no keyring uri nor a master key
     if ! which wget >/dev/null 2>&1; then
-	echo "ERROR: an installed wget is required for a network-based update"
+	echo >&2 "ERROR: an installed wget is required for a network-based update"
 	exit 1
     fi
     if [ ! -d /var/lib/apt/keyrings ]; then
@@ -93,6 +101,7 @@ update() {
 	echo >&2 "Is the debian-archive-keyring package installed?"
 	exit 1
     fi
+    requires_root
 
     # add new keys from the package;
 
@@ -184,10 +193,12 @@ fi
 
 case "$command" in
     add)
+        requires_root
         $GPG --quiet --batch --import "$1"
         echo "OK"
         ;;
     del|rm|remove)
+        requires_root
         $GPG --quiet --batch --delete-key --yes "$1"
         echo "OK"
         ;;
diff --git a/debian/apt.symbols b/debian/apt.symbols
index bb60c22be..932fb1411 100644
--- a/debian/apt.symbols
+++ b/debian/apt.symbols
@@ -1230,23 +1230,30 @@ libapt-pkg.so.4.10 libapt-pkg4.10
 # (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
 # (c++|regex|optional=std)"^pkgCache::(Dep|Pkg|Ver|Grp|Prv|Desc|PkgFile)Iterator\*\* std::_.+@Base$" 0.8.0
 ### gcc-4.5 specific
- (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0
- (c++|optional=inline)"FileFd::FileFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
- (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0
- (c++|optional=template)"SPtrArray<unsigned char>::~SPtrArray()@Base" 0.8.0
+# (c++|regex|optional=std)"^char\* std::[^ ]+<.+ >::_.+@Base$" 0.8.0
+# (c++|optional=inline)"FileFd::FileFd(std::basic_string<char, std::char_traits<char>, std::allocator<char> >, FileFd::OpenMode, unsigned long)@Base" 0.8.0
+# (c++|regex|optional=template)"^SPtrArray<[^ ]+>::~SPtrArray\(\)@Base$" 0.8.0
+# (c++|optional=template)"SPtrArray<unsigned char>::~SPtrArray()@Base" 0.8.0
 ### gcc-4.6 specific
  (c++|optional=template)"SPtrArray<pkgCache::Version*>::~SPtrArray()@Base" 0.8.0
  (c++|regex|optional=std)"^std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string<char( const|)\*>\(.+\)@Base$" 0.8.0
  (c++|regex|optional=std)"^std::vector<DiffInfo, .+@Base$" 0.8.0
  (c++|regex|optional=std)"^std::vector<.+ >::(vector|push_back|erase|_[^ ]+)\(.+\)( const|)@Base$" 0.8.0
- (c++|optional=strange)"pkgCache::VerIterator::VerIterator(pkgCache&, pkgCache::Version*)@Base" 0.8.0
+# (c++|optional=strange)"pkgCache::VerIterator::VerIterator(pkgCache&, pkgCache::Version*)@Base" 0.8.0
+### architecture specific: va_list
+ (arch=armel armhf|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, std::__va_list&) const@Base" 0.8.15~exp1 1
+ (arch=i386 hurd-i386 kfreebsd-i386|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, char*&) const@Base" 0.8.15~exp1 1
+ (arch=hppa ia64 mips mipsel sparc sparc64|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, void*&) const@Base" 0.8.15~exp1 1
+ (arch=amd64 kfreebsd-amd64 powerpc powerpcspe s390|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag (&) [1]) const@Base" 0.8.15~exp1 1
+ (arch=sh4|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __builtin_va_list&) const@Base" 0.8.15~exp1 1
+ (arch=alpha|c++)"pkgAcqMethod::PrintStatus(char const*, char const*, __va_list_tag&) const@Base" 0.8.15~exp1 1
 ### architecture specific: va_list & size_t
  (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, char*&, unsigned int&)@Base" 0.8.11.4 1
  (arch=armel armhf|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, std::__va_list&, unsigned int&)@Base" 0.8.11.4 1
  (arch=alpha|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag&, unsigned long&)@Base" 0.8.11.4 1
  (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned int&)@Base" 0.8.11.4 1
  (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __va_list_tag (&) [1], unsigned long&)@Base" 0.8.11.4 1
- (arch=hppa mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 1
+ (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned int&)@Base" 0.8.11.4 1
  (arch=ia64 sparc64|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, void*&, unsigned long&)@Base" 0.8.11.4 1
  (arch=sh4|c++|optional=private)"GlobalError::Insert(GlobalError::MsgType, char const*, __builtin_va_list&, unsigned int&)@Base" 0.8.11.4 1
  (arch=i386 hurd-i386 kfreebsd-i386|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, char*&, int, unsigned int&)@Base" 0.8.11.4 1
@@ -1254,13 +1261,13 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (arch=alpha|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag&, int, unsigned long&)@Base" 0.8.11.4 1
  (arch=powerpc powerpcspe|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned int&)@Base" 0.8.11.4 1
  (arch=amd64 kfreebsd-amd64 s390|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __va_list_tag (&) [1], int, unsigned long&)@Base" 0.8.11.4 1
- (arch=hppa mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4 1
+ (arch=hppa mips mipsel sparc|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned int&)@Base" 0.8.11.4 1
  (arch=ia64 sparc64|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, void*&, int, unsigned long&)@Base" 0.8.11.4 1
  (arch=sh4|c++|optional=private)"GlobalError::InsertErrno(GlobalError::MsgType, char const*, char const*, __builtin_va_list&, int, unsigned int&)@Base" 0.8.11.4 1
 ### architecture specific: size_t
- (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
+ (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"_strtabexpand(char*, unsigned int)@Base" 0.8.0
  (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"_strtabexpand(char*, unsigned long)@Base" 0.8.0
- (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mipsel powerpc powerpcspe sh4 sparc|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.8.0
+ (arch=i386 armel armhf hppa hurd-i386 kfreebsd-i386 mips mipsel powerpc powerpcspe sh4 sparc|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned int&)@Base" 0.8.0
  (arch=alpha amd64 ia64 kfreebsd-amd64 s390 sparc64|c++)"indexRecords::parseSumData(char const*&, char const*, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, unsigned long&)@Base" 0.8.0
 ### try to ignore std:: template instances
  (c++|regex|optional=std)"^(void |)std::[^ ]+<.+ >::(_|~).+\(.*\)@Base$" 0.8.0
@@ -1318,3 +1325,5 @@ libapt-pkg.so.4.10 libapt-pkg4.10
  (c++|optional=private)"debListParser::NewProvidesAllArch(pkgCache::VerIterator&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.8.13.2 1
  (c++|optional=private)"PrintMode(char)@Base" 0.8.13.2 1
  (c++)"pkgDepCache::IsModeChangeOk(pkgDepCache::ModeList, pkgCache::PkgIterator const&, unsigned long, bool)@Base" 0.8.13.2 1
+ (c++)"pkgPackageManager::SmartUnPack(pkgCache::PkgIterator, bool)@Base" 0.8.15~exp1 1
+ (c++)"pkgCache::DepIterator::IsNegative() const@Base" 0.8.15~exp1 1
diff --git a/debian/changelog b/debian/changelog
index d02091f54..2e22e64d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,60 @@
-apt (0.8.15) UNRELEASED; urgency=low
+apt (0.8.15.3) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/acquire-item.cc:
+    - improve error message for a expired Release file
+  * apt-pkg/algorithms.cc:
+    - Hold back packages that would enter "policy-broken" state on upgrade
+      when doing a "apt-get upgrade"
+
+  [ David Kalnischkies ]
+  * apt-pkg/pkgcachegen.cc:
+    - fallback to memory if file is not writeable even if access()
+      told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
+  * doc/sources.list.5.xml:
+    - document available [options] for sources.list entries (Closes: 632441)
+  * doc/apt.conf.5.xml:
+    - document APT::Architectures list (Closes: #612102)
+  * cmdline/apt-get.cc:
+    - restore all important dependencies for garbage packages (LP: #806274)
+  * apt-pkg/init.cc:
+    - use CndSet in pkgInitConfig (Closes: #629617)
+  * apt-pkg/depcache.cc:
+    - change default of APT::AutoRemove::SuggestsImportant to true
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 15 Jul 2011 09:29:37 +0200
+
+apt (0.8.15.2) unstable; urgency=high
+
+  * fix from David Kalnischkies for the InRelease gpg verification 
+    code (LP: #784473)
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 12 Jul 2011 11:54:47 +0200
+
+apt (0.8.15.1) unstable; urgency=low
+
+  [ David Kalnischkies ]
+  * doc/makefile:
+    - create doxygen directory to avoid depending on magic (Closes: #628799)
+  * cmdline/apt-key:
+    - explicitly state that net-update is not supported if no url is set
+    - require to be root for add, rm, update and net-update
+    - clarify update vs. net-update in different distros (Closes: #632043)
+  * debian/apt.symbols:
+    - forgot 'mips' in the list for all architecture dependent symbols
+    - comment out gcc-4.5 specific symbols as gcc-4.6 is now default
+    - the symbol for PrintStatus() is architecture dependent
+  * apt-pkg/policy.cc:
+    - do not segfault in pinning if a package with this name doesn't exist.
+      Thanks to Ferdinand Thommes for the report!
+    - Defaults is a vector of Pin not of PkgPin
+    - ensure that only the first specific stanza for a package is used
+    - save all stanzas which had no effect in Unmatched
+    - allow package:architecure in Package:
+
+ -- Michael Vogt <mvo@debian.org>  Thu, 30 Jun 2011 10:05:36 +0200
+
+apt (0.8.15) unstable; urgency=low
 
   [ Julian Andres Klode ]
   * apt-pkg/depcache.cc:
@@ -17,6 +73,8 @@ apt (0.8.15) UNRELEASED; urgency=low
   [ Christian Perrier ]
   * Galician translation update (Miguel Anxo Bouzada). Closes: #626505
   * Italian translation update (Milo Casagrande). Closes: #627834
+  * German documentation translation update (Chris Leick). Closes: #629949
+  * Catalan translation update (Jordi Mallach). Closes: #630657
 
   [ David Kalnischkies ]
   * fix a bunch of cppcheck warnings/errors based on a patch by
@@ -33,6 +91,8 @@ apt (0.8.15) UNRELEASED; urgency=low
     - let VisitRProvides report if the calls were successful
   * apt-pkg/deb/dpkgpm.cc:
     - replace obsolete usleep with nanosleep
+    - remove invalid pkgcache.bin and rebuild it if possible
+    - log reinstall commands in history.log
   * debian/apt{,-utils}.symbols:
     - update both experimental symbol-files to reflect 0.8.14 state
   * debian/rules:
@@ -73,8 +133,35 @@ apt (0.8.15) UNRELEASED; urgency=low
   * apt-pkg/packagemanager.cc:
     - ensure for Multi-Arch:same packages that they are unpacked in
       lock step even in immediate configuration (Closes: #618288)
+  * apt-pkg/init.cc:
+    - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
+  * cmdline/apt-config.cc:
+    - show Acquire::Languages and APT::Architectures settings
+      in 'dump' (Closes: 626739)
+  * apt-pkg/orderlist.cc:
+    - ensure that an old version of a package with a provides can
+      never satisfy a dependency of a newer version of this package
+
+  [ Michael Vogt ]
+  * methods/mirror.cc:
+    - ignore lines starting with "#" in the mirror file
+    - ignore non http urls in the mirrors
+    - append the dist (e.g. sid, wheezy) as a query string when
+      asking for a suitable mirror 
+  * apt-pkg/deb/deblistparser.cc:
+    - include all known languages when building the apt cache
+      (LP: #794907)
+  * apt-pkg/deb/debindexfile.cc:
+    - remove some no longer valid checks for "TranslationsAvailable()"
+
+  [ Kenneth Solbø Andersen ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - set permissions of term.log to root.adm and 644 (LP: #404724)
+  
+  [ Chris Leick ]
+  * various typo and syntax corrections in doc/*.xml
 
- -- Michael Vogt <mvo@debian.org>  Mon, 16 May 2011 14:57:52 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 18:00:48 +0200
 
 apt (0.8.14.1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 0544b2b8e..640900678 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,9 +120,6 @@ libapt-pkg-doc: build-doc
 #
 # libapt-pkg-doc install
 #
-	# remove doxygen's embedded jquery as we don't use it anyway (#622147)
-	rm -f $(BLD)/doc/doxygen/html/jquery.js
-
 	dh_installdocs -p$@ $(BLD)/docs/design* \
 			    $(BLD)/docs/dpkg-tech* \
 			    $(BLD)/docs/files* \
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 9c6c64dac..431ef8704 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -315,7 +315,7 @@ Reverse Provides:
 		   <term><option>--no-replaces</option></term>
 		   <term><option>--no-enhances</option></term>
 		   <listitem><para>Per default the <literal>depends</literal> and
-     <literal>rdepends</literal> print all dependencies. This can be twicked with
+     <literal>rdepends</literal> print all dependencies. This can be tweaked 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>.</para></listitem>
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 8e5df1f36..b08ebe80f 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -532,8 +532,9 @@ for i in Sections do
      index files will not have the checksum fields where possible.
      Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and
      <literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> where
-     <literal>Index</literal> can be <literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</literal> and
-     <literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>.</para></listitem>
+     <literal><replaceable>Index</replaceable></literal> can be <literal>Packages</literal>, <literal>Sources</literal> or
+     <literal>Release</literal> and <literal><replaceable>Checksum</replaceable></literal> can be <literal>MD5</literal>,
+     <literal>SHA1</literal> or <literal>SHA256</literal>.</para></listitem>
      </varlistentry>
 
      <varlistentry><term><option>-d</option></term><term><option>--db</option></term>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 18f26e569..11b53e5e7 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -280,7 +280,7 @@
 
      <varlistentry><term>download</term>
        <listitem><para><literal>download</literal> will download the given
-           binary package into the current directoy.
+           binary package into the current directory.
        </para></listitem>
      </varlistentry>
 
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 9bfab84b6..f17f0c45e 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -128,9 +128,10 @@
      <listitem>
      <para>
 
-       Update the local keyring with the keyring of Debian archive
-       keys and removes from the keyring the archive keys which are no
-       longer valid.
+       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>debian-archive-keyring</literal> package in Debian.
 
      </para>
 
@@ -141,12 +142,14 @@
      <listitem>
      <para>
 
-       Update the local keyring with the keys of a key server
-       and removes from the keyring the archive keys which are no
-       longer valid. This requires an installed wget and an APT
-       build configured to have a server to fetch from. APT in
-       Debian does not support this command, but Ubuntu's APT
-       does.
+       Work similar to the <command>update</command> command above, but get the
+       archive keyring from an URI instead and validate it against a master key.
+
+       This requires an installed &wget; and an APT build configured to have
+       a server to fetch from and a master keyring to validate.
+
+       APT in Debian does not support this command and relies on
+       <command>update</command> instead, but Ubuntu's APT does.
 
      </para>
 
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a194a9d0d..14cd70e89 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -148,6 +148,12 @@
   </citerefentry>"
 >
 
+<!ENTITY wget "<citerefentry>
+    <refentrytitle><command>wget</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 477507598..2634c47a9 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -50,7 +50,7 @@
       <listitem><para>the file specified by the <envar>APT_CONFIG</envar>
 	 environment variable (if any)</para></listitem>
       <listitem><para>all files in <literal>Dir::Etc::Parts</literal> in
-	 alphanumeric ascending order which have no or "<literal>conf</literal>"
+	 alphanumeric ascending order which have either no or "<literal>conf</literal>"
 	 as filename extension and which only contain alphanumeric,
 	 hyphen (-), underscore (_) and period (.) characters.
 	 Otherwise APT will print a notice that it has ignored a file if the file
@@ -153,7 +153,15 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      parsing package lists. The internal default is the architecture apt was 
      compiled for.</para></listitem>
      </varlistentry>
-     
+
+     <varlistentry><term>Architectures</term>
+     <listitem><para>All Architectures the system supports. Processors implementing the <literal>amd64</literal>
+     are e.g. also able to execute binaries compiled for <literal>i386</literal>; This list is use when fetching files and
+     parsing package lists. The internal default is always the native architecture (<literal>APT::Architecture</literal>)
+     and all foreign architectures it can retrieve by calling <command>dpkg --print-foreign-architectures</command>.
+     </para></listitem>
+     </varlistentry>
+
      <varlistentry><term>Default-Release</term>
      <listitem><para>Default release to install packages from if more than one
      version available. Contains release name, codename or release version. Examples: 'stable', 'testing',
@@ -441,13 +449,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      It is not needed to add <literal>bz2</literal> explicit to the list as it will be added automatic.</para>
      <para>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 <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
+     the bzip2 method (the inbuilt) setting is: <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
      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 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.</para>
      <para>The special type <literal>uncompressed</literal> can be used to give uncompressed files a
-     preference, but note that most archives doesn't provide uncompressed files so this is mostly only
+     preference, but note that most archives don't provide uncompressed files so this is mostly only
      useable for local mirrors.</para></listitem>
      </varlistentry>
 
diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml
index 55504f3e5..f08f92b94 100644
--- a/doc/apt_preferences.5.xml
+++ b/doc/apt_preferences.5.xml
@@ -69,8 +69,8 @@ You have been warned.</para>
 
 <para>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 (-),
+following naming convention: The files have either no or "<literal>pref</literal>"
+as filename extension and only contain alphanumeric, hyphen (-),
 underscore (_) and period (.) characters.
 Otherwise APT will print a notice that it has ignored a file if the file
 doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal>
@@ -265,7 +265,7 @@ APT also supports pinning by glob() expressions and regular
 expressions surrounded by /. For example, the following
 example assigns the priority 500 to all packages from
 experimental where the name starts with gnome (as a glob()-like
-expression or contains the word kde (as a POSIX extended regular
+expression) or contains the word kde (as a POSIX extended regular
 expression surrounded by slashes).
 </para>
 
@@ -277,7 +277,7 @@ Pin-Priority: 500
 
 <para>
 The rule for those expressions is that they can occur anywhere
-where a string can occur. Those, the following pin assigns the
+where a string can occur. Thus, the following pin assigns the
 priority 990 to all packages from a release starting with karmic.
 </para>
 
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 6884e06e3..27232d40b 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -23,6 +23,7 @@ quiet::NoUpdate "true"; // never update progress information - included in -q=1
 APT 
 {
   Architecture "i386";
+  Architectures { "amd64"; "armel"; };
   Build-Essential "build-essential";
 
   NeverAutoRemove  { "linux-image.*";  };  // packages that should never
diff --git a/doc/makefile b/doc/makefile
index 8a889c94c..4fcf3bd10 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -101,6 +101,7 @@ $(BUILD)/doc/Doxyfile: Doxyfile.in
 
 $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
 	rm -fr $(BUILD)/doc/doxygen
+	mkdir $(BUILD)/doc/doxygen  # some versions seem to not create this directory #628799
 	$(DOXYGEN) $(BUILD)/doc/Doxyfile
 	touch $(BUILD)/doc/doxygen-stamp
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e58059267..586e0378c 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -967,7 +971,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393 apt-sortpkgs.1.xml:61
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393 apt-sortpkgs.1.xml:61
+>>>>>>> MERGE-SOURCE
 msgid "<option>-s</option>"
 msgstr ""
 
@@ -987,12 +995,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1067,7 +1083,7 @@ msgstr ""
 #: apt-cache.8.xml:317
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1091,7 +1107,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr ""
 
@@ -1187,7 +1207,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
+<<<<<<< TREE
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+=======
+#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+>>>>>>> MERGE-SOURCE
 msgid "&apt-commonoptions;"
 msgstr ""
 
@@ -1202,7 +1226,11 @@ msgid "&file-sourceslist; &file-statelists;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234
+=======
+#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585 apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704 sources.list.5.xml:234
+>>>>>>> MERGE-SOURCE
 msgid "See Also"
 msgstr ""
 
@@ -1212,7 +1240,11 @@ msgid "&apt-conf;, &sources-list;, &apt-get;"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+=======
+#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+>>>>>>> MERGE-SOURCE
 msgid "Diagnostics"
 msgstr ""
 
@@ -1316,7 +1348,11 @@ msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1519,7 +1555,11 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628 apt-sortpkgs.1.xml:73
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73
+>>>>>>> MERGE-SOURCE
 msgid "&apt-conf;"
 msgstr ""
 
@@ -2443,26 +2483,47 @@ msgid ""
 "Configuration Items: "
 "<literal>APT::FTPArchive::<replaceable>Checksum</replaceable></literal> and "
 "<literal>APT::FTPArchive::<replaceable>Index</replaceable>::<replaceable>Checksum</replaceable></literal> "
+<<<<<<< TREE
 "where <literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, "
 "<literal>SHA1</literal> or <literal>SHA256</literal>."
+=======
+"where <literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or "
+"<literal>Release</literal> and "
+"<literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or "
+"<literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2471,12 +2532,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2485,12 +2554,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2500,12 +2577,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: "
@@ -2513,24 +2598,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: "
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2539,12 +2640,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2558,12 +2667,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2573,12 +2690,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544 sources.list.5.xml:198
+>>>>>>> MERGE-SOURCE
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid ""
 "<command>apt-ftparchive</command> packages "
@@ -2587,14 +2712,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2922,7 +3055,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4199,10 +4332,10 @@ msgstr ""
 #: apt.conf.5.xml:52
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the "
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
 "case it will be silently ignored."
 msgstr ""
@@ -4910,7 +5043,7 @@ 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 "
+"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 "
@@ -4923,7 +5056,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -5865,8 +5998,8 @@ msgstr ""
 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 "
+"following naming convention: The files have either no or "
+"\"<literal>pref</literal>\" as filename extension and only contain "
 "alphanumeric, hyphen (-), underscore (_) and period (.) characters.  "
 "Otherwise APT will print a notice that it has ignored a file if the file "
 "doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
@@ -6198,8 +6331,13 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a "
+<<<<<<< TREE
 "glob()-like expression or contains the word kde (as a POSIX extended regular "
 "expression surrounded by slashes)."
+=======
+"glob()-like expression) or contains the word kde (as a POSIX extended "
+"regular expression surrounded by slashes)."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -6215,7 +6353,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/de.po b/doc/po/de.po
index a36144bb9..b10c657d4 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1,14 +1,19 @@
 # Translation of apt-doc to German
 # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
 # This file is distributed under the same license as the apt-doc package.
-# Chris Leick <c.leick@vollbio.de>, 2009, 2010.
+# Chris Leick <c.leick@vollbio.de>, 2009-2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.7.25.3\n"
+"Project-Id-Version: apt-doc 0.8.14-1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
 "PO-Revision-Date: 2010-09-16 19:04+0100\n"
+=======
+"POT-Creation-Date: 2011-06-28 13:40+0300\n"
+"PO-Revision-Date: 2011-05-31 21:00+0100\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -656,16 +661,12 @@ msgstr ""
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
-#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#| "<date>14 February 2004</date>"
 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
 "February 2011</date>"
 msgstr ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-"<date>14. Februar 2004</date>"
+"<date>04. Februar 2011</date>"
 
 #. type: Content of: <refentry><refnamediv><refname>
 #: apt-cache.8.xml:25 apt-cache.8.xml:32
@@ -690,33 +691,10 @@ msgstr "APT"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cache.8.xml:33
 msgid "query the APT cache"
-msgstr ""
+msgstr "den APT-Zwischenspeicher abfragen"
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-cache.8.xml:39
-#, fuzzy
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
 msgid ""
 "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
 "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -741,16 +719,15 @@ msgstr ""
 "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
 "o=<replaceable>Konfigurationszeichenkette</replaceable></option></arg> "
 "<arg><option>-c=<replaceable>Datei</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>Datei</replaceable></arg></arg> <arg>gencaches</arg> "
-"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-"arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-"\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain"
-"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>depends "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-"arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
+"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
+"\"repeat\"><replaceable>Paket</replaceable></arg></arg> <arg>showsrc <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
+"<arg>search <arg choice=\"plain\"><replaceable>regulärer_Ausdruck</"
+"replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>Paket</replaceable></arg></arg> <arg>depends <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
+"<arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>Paket</"
 "replaceable></arg></arg> <arg>pkgnames <arg choice=\"plain"
 "\"><replaceable>Präfix</replaceable></arg></arg> <arg>dotty <arg choice="
 "\"plain\" rep=\"repeat\"><replaceable>Paket</replaceable></arg></arg> "
@@ -1310,7 +1287,11 @@ msgstr ""
 "pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1338,12 +1319,20 @@ msgstr ""
 "srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1422,12 +1411,18 @@ msgstr "<option>--no-replaces</option>"
 msgid "<option>--no-enhances</option>"
 msgstr "<option>--no-enhances</option>"
 
-# FIXME s/twicked/tricked/
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:317
+#, 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 twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1458,7 +1453,11 @@ msgstr ""
 "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1575,7 +1574,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1593,7 +1596,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1607,7 +1614,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnose"
@@ -1742,7 +1753,11 @@ msgid "Options"
 msgstr "Optionen"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -1912,7 +1927,7 @@ msgstr ""
 "<command>apt-config</command><arg><option>-hv</option></arg><arg><option>-"
 "o=<replaceable>Konfigurationszeichenkette</replaceable></option></"
 "arg><arg><option>-c=<replaceable>Datei</replaceable></option></arg><group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
+"choice=\"req\"> <arg>shell</arg> <arg>Abbild</arg> </group>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-config.8.xml:51
@@ -1996,7 +2011,11 @@ msgid "Just show the contents of the configuration space."
 msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt."
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -2309,6 +2328,18 @@ msgid ""
 "literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
 "and SHA256 digest for each file."
 msgstr ""
+"Der Befehl <literal>release</literal> erzeugt eine Release-Datei aus einem "
+"Verzeichnisbaum. Standardmäßig durchsucht er rekursiv das angegebene "
+"Verzeichnis nach nicht komprimierten <filename>Packages</filename>- und "
+"<filename>Sources</filename>-Dateien und denen, die mit <command>gzip</"
+"command>, <command>bzip2</command> oder <command>lzma</command> komprimiert "
+"wurden, ebenso wie <filename>Release</filename>- und <filename>md5sum.txt</"
+"filename>-Dateien (<literal>APT::FTPArchive::Release::Default-Patterns</"
+"literal>). Zusätzliche Muster für Dateinamen können hinzugefügt werden, "
+"indem sie in <literal>APT::FTPArchive::Release::Patterns</literal> "
+"aufgeführt werden. Dann schreibt er eine Release-Datei auf die "
+"Standardausgabe, die für jede Datei eine MD5-, SHA1- und SHA256-Prüfsumme "
+"enthält."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:125
@@ -3147,6 +3178,10 @@ msgstr ""
 msgid ""
 "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
 msgstr ""
+<<<<<<< TREE
+=======
+"<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:531
@@ -3166,11 +3201,19 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
-msgstr ""
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+<<<<<<< TREE
 "Werte für zusätzliche Metadatenfelder in der Release-Datei werden den "
 "entsprechenden Variablen unter <literal>APT::FTPArchive::Release</literal> "
 "entnommen, z.B. <literal>APT::FTPArchive::Release::Origin</literal>. Die "
@@ -3179,14 +3222,34 @@ msgstr ""
 "<literal>Codename</literal>, <literal>Date</literal>, <literal>Valid-Until</"
 "literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+=======
+"erzeugt die vorgegebene Prüfsumme. Diese Optionen sind standardmäßig "
+"aktiviert. Wenn sie deaktiviert sind, werden die erzeugten Indexdateien nach "
+"Möglichkeit keine Prüfsummenfelder erhalten. Konfigurationselemente: "
+"<literal>APT::FTPArchive::<replaceable>Prüfsumme</replaceable></literal> und "
+"<literal>APT::FTPArchive::<replaceable>Index</replaceable>::"
+"<replaceable>Prüfsumme</replaceable></literal>, wobei <literal><replaceable>Index</replaceable></"
+"literal> <literal>Packages</literal>, <literal>Sources</literal> oder "
+"<literal>Release</literal> sein kann und <literal><replaceable>Prüfsumme</replaceable></literal> "
+"<literal>MD5</literal>, <literal>SHA1</literal> oder <literal>SHA256</"
+"literal> sein kann."
+>>>>>>> MERGE-SOURCE
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3196,7 +3259,11 @@ msgstr ""
 "DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3210,12 +3277,20 @@ msgstr ""
 "Konfigurationselement: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3229,12 +3304,20 @@ msgstr ""
 "DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3250,12 +3333,20 @@ msgstr ""
 "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3266,12 +3357,20 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3280,12 +3379,20 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3299,12 +3406,20 @@ msgstr ""
 "Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3328,12 +3443,20 @@ msgstr ""
 "haben sollte und all diese zusätzlichen Prüfungen daher nutzlos sind."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3349,19 +3472,31 @@ msgstr ""
 "werden kann."
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Beispiele"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3371,7 +3506,11 @@ msgstr ""
 ">"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3841,14 +3980,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:281
 msgid "download"
-msgstr ""
+msgstr "download"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
+"<literal>download</literal> wird das angegebene Binärpaket in das aktuelle "
+"Verzeichnis herunterladen."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:288
@@ -3913,7 +4054,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:312
 msgid "changelog"
-msgstr ""
+msgstr "changelog"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:313
@@ -3927,6 +4068,14 @@ msgid ""
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
+"<literal>changelog</literal> lädt ein Changelog eines Pakets herunter und "
+"zeigt es mit <command>sensible-pager</command> an. Der Servername und das "
+"Basisverzeichnis sind in der Variable <literal>APT::Changelogs::Server</"
+"literal> definiert (z.B. <ulink>http://packages.debian.org/changelogs</"
+"ulink> für Debian oder <ulink>http://changelogs.ubuntu.com/changelogs</"
+"ulink> für Ubuntu). Standardmäßig zeigt es das Changelog für die "
+"installierte Version. Sie können jedoch die gleichen Optionen wie für den "
+"Befehl <option>install</option> angeben."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:335
@@ -3944,23 +4093,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:340
-#, fuzzy
-#| msgid "<option>--no-suggests</option>"
 msgid "<option>--install-suggests</option>"
-msgstr "<option>--no-suggests</option>"
+msgstr "<option>--install-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:341
-#, 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 ""
-"Empfohlene Pakete nicht als Abhängigkeit für die Installation betrachten. "
-"Konfigurationselement: <literal>APT::Install-Recommends</literal>."
+"Empfohlene Pakete als Abhängigkeit für die Installation betrachten. "
+"Konfigurationselement: <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:345
@@ -5290,14 +5433,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:147
-#, 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 "
@@ -5310,8 +5445,9 @@ msgstr ""
 "(Sie sollten sicherstellen, dass Sie einen vertrauenswürdigen "
 "Kommunikationskanal benutzen, wenn Sie ihn herunterladen), ihn mit "
 "<command>apt-key</command> hinzufügen und dann <command>apt-get update</"
-"command> ausführen, so dass APT die <filename>Release.gpg</filename>-Dateien "
-"der von Ihnen konfigurierten Archive herunterladen und prüfen kann."
+"command> ausführen, so dass APT die Dateien <filename>InRelease</filename> "
+"oder <filename>Release.gpg</filename> der von Ihnen konfigurierten Archive "
+"herunterladen und prüfen kann."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:156
@@ -5340,17 +5476,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:168
-#, 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>Es signieren</emphasis>. Sie können dies tun, indem Sie "
-"<command>gpg -abs -o Release.gpg Release</command> ausführen."
+"<command>gpg --clearsign -o InRelease Release</command> und <command>gpg -"
+"abs -o Release.gpg Release</command> ausführen."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:172
@@ -5548,20 +5681,27 @@ msgstr ""
 #| "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."
+#| "period (.) characters.  Otherwise APT will print a notice that it has "
+#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+#| "be silently ignored."
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 "alle Dateien in <literal>Dir::Etc::Parts</literal> in aufsteigender "
 "alphanumerischer Reihenfolge, die kein »<literal>conf</literal>« als "
-"Dateinamenserweiterung haben und die alphanumerische Zeichen, Bindestriche "
-"(-), Unterstriche (_) und Punkte (.) enthalten – andernfalls werden sie "
-"stillschweigend ignoriert."
+"Dateinamenserweiterung haben und die nur alphanumerische Zeichen, "
+"Bindestriche (-), Unterstriche (_) und Punkte (.) enthalten. Andernfalls "
+"wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die "
+"Datei nicht auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-"
+"Files-Silently</literal> passt – in diesem Fall wird sie stillschweigend "
+"ignoriert."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:59
@@ -6601,16 +6741,16 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 #| "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 "
+#| "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 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 "
+"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 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 "
@@ -6620,21 +6760,25 @@ msgstr ""
 "replaceable></literal> zur Laufzeit geprüft wird: Falls diese Einstellung "
 "existiert, wird die Methode nur benutzt, wenn die Datei existiert, z.B. für "
 "die (integrierte) bzip2-Methode ist die Einstellung <placeholder type="
-"\"literallayout\" id=\"0\"/>. Beachten Sie, dass diese auf der Befehlszeile "
+"\"literallayout\" id=\"0\"/>. Beachten Sie auch, dass auf der Befehlszeile "
 "eingegebenen Einträge an das Ende der Liste angehängt werden, die in den "
 "Konfigurationsdateien angegeben wurde, aber vor den Vorgabeeinträgen. Um "
-"einen Eintrag in diesem Fall vor einem, über die in der Konfigurationsdatei "
-"angegebenen, zu bevorzugen, können Sie diese Option direkt setzen – nicht im "
-"Listenstil. Dies wird die definierte Liste nicht überschreiben, es wird "
-"diesen Typ nur vor die Liste setzen."
+"einen Typ in diesem Fall gegenüber einem, der über die Konfigurationsdatei "
+"angegebenen wurde, zu bevorzugen, können Sie diese Option direkt setzen – "
+"nicht im Listenstil. Dies wird die definierte Liste nicht überschreiben, es "
+"wird diesen Typ nur vor die Liste setzen."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
+"Der besondere Typ <literal>uncompressed</literal> kann benutzt werden, um "
+"unkomprimierten Dateien einen Vorrang zu geben, beachten Sie jedoch, dass "
+"die meisten Archive keine unkomprimierten Dateien bereitstellen, so dass "
+"dies meist nur für lokale Spiegel benutzt werden kann."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:454
@@ -7070,19 +7214,6 @@ msgstr "Dpkd-Trigger-Benutzung (und zugehöriger Optionen)"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt.conf.5.xml:621
-#, 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 productive 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 a way so it can make aggressive use of triggers over "
 "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -7095,17 +7226,18 @@ msgid ""
 "all frontends will currently stay around half (or more) of the time in the "
 "100% state while it actually configures all packages."
 msgstr ""
-"APT kann Dpkg auf eine Art aufrufen, auf die aggressiv Gebrauch von Triggern "
-"über mehrere Dpkg-Aufrufe gemacht wird. Ohne weitere Optionen wird Dpkg "
-"Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen zu "
-"benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit verkürzen. "
-"Beachten Sie, dass geplant ist, diese Optionen in Zukunft standardmäßig zu "
-"aktivieren, aber da es die Art, wie APT Dpkg aufruft, drastisch ändert, "
-"benötigt es noch viele weitere Tests. <emphasis>Diese Optionen sind daher "
-"aktuell noch experimentell und sollten nicht in produktiven Umgebungen "
-"benutzt werden.</emphasis> Außerdem unterbricht es die Fortschrittsanzeige, "
-"so dass alle Oberflächen aktuell in der halben (oder mehr) Zeit auf dem "
-"Status 100% stehen, während es aktuell alle Pakete konfiguriert."
+"APT kann Dpkg auf eine Art aufrufen, in der aggressiv Gebrauch von Triggern "
+"über mehrere Dpkg-Aufrufe hinweg gemacht wird. Ohne weitere Optionen wird "
+"Dpkg Trigger nur während seiner eigenen Ausführung benutzen. Diese Optionen "
+"zu benutzen, kann daher die zum Installieren/Upgrade benötigte Zeit "
+"verkürzen. Beachten Sie, dass geplant ist, diese Optionen in Zukunft "
+"standardmäßig zu aktivieren, aber da es die Art, wie APT Dpkg aufruft, "
+"drastisch ändert, benötigt es noch viele weitere Tests. <emphasis>Diese "
+"Optionen sind daher aktuell noch experimentell und sollten nicht in "
+"produktiven Umgebungen benutzt werden.</emphasis> Außerdem unterbricht es "
+"die Fortschrittsanzeige, so dass alle Oberflächen derzeit die halbe (oder "
+"mehr) Zeit auf dem Status 100% stehen, während tatsächlich alle Pakete "
+"konfiguriert werden."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
 #: apt.conf.5.xml:636
@@ -7931,23 +8063,28 @@ msgstr ""
 #| "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."
+#| "hyphen (-), underscore (_) and period (.) characters.  Otherwise APT will "
+#| "print a notice that it has ignored a file if the file doesn't match a "
+#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+#| "configuration list - in this case it 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 "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
 "case it will be silently ignored."
 msgstr ""
-"Beachten Sie, dass die Dateien im Verzeichnis /etc/apt/preferences.d in "
-"alphanumerisch aufsteigender Richtung ausgewertet werden und der folgenden "
-"Namenskonvention unterliegen: Die Dateien haben keine oder »pref« als "
-"Dateierweiterung und sie enthalten nur alphanumerische Zeichen, Bindestriche "
-"(-), Unterstriche (_) oder Punkte (.). Wenn dies nicht der Fall ist, werden "
+"Beachten Sie, dass die Dateien im Verzeichnis <filename>/etc/apt/preferences."
+"d</filename> in alphanumerisch aufsteigender Reihenfolge ausgewertet werden "
+"und der folgenden Namenskonvention unterliegen: Die Dateien haben keine oder "
+"<literal>»pref«</literal> als Dateierweiterung und sie enthalten nur "
+"alphanumerische Zeichen, Bindestriche (-), Unterstriche (_) oder Punkte (.). "
+"Andernfalls wird APT einen Hinweis ausgeben, dass es eine Datei ignoriert "
+"hat, falls die Datei nicht auf ein Muster in der Konfigurationsliste "
+"<literal>Dir::Ignore-Files-Silently</literal> passt – in diesem Fall wird "
 "sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
@@ -8005,17 +8142,24 @@ msgstr "Priorität 1"
 #, fuzzy
 #| msgid ""
 #| "to the versions coming from archives which in their <filename>Release</"
+<<<<<<< TREE
 #| "filename> files are marked as \"NotAutomatic: yes\" like the debian "
 #| "experimental archive."
+=======
+#| "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
+#| "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
+#| "<literal>experimental</literal> archive."
+>>>>>>> MERGE-SOURCE
 msgid ""
 "to the versions coming from archives which in their <filename>Release</"
 "filename> files are marked as \"NotAutomatic: yes\" but <emphasis>not</"
 "emphasis> as \"ButAutomaticUpgrades: yes\" like the debian "
 "<literal>experimental</literal> archive."
 msgstr ""
-"zu den Versionen, die von Archiven kommen, deren <filename>Release</"
-"filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
-"Experimental-Archiv."
+"zu den Versionen, die von Archiven kommen, die in deren <filename>Release</"
+"filename>-Dateien als »NotAutomatic: yes« markiert sind, aber "
+"<emphasis>nicht</emphasis> als »ButAutomaticUpgrades: yes« wie das Archiv "
+"<literal>experimental</literal> von Debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:113
@@ -8024,20 +8168,31 @@ msgstr "Priorität 100"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:114
+<<<<<<< TREE
 #, 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."
+=======
+>>>>>>> MERGE-SOURCE
 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 ""
+<<<<<<< TREE
 "zu den Versionen, die von Archiven kommen, deren <filename>Release</"
 "filename>-Dateien als »NotAutomatic: yes« markiert sind, wie das Debian-"
 "Experimental-Archiv."
+=======
+"zu der Version, die bereits installiert ist (wenn dies der Fall ist) und zu "
+"Versionen, die von Archiven kommen, die in deren <filename>Release</"
+"filename>-Dateien als »NotAutomatic: yes« und »ButAutomaticUpgrades: yes« "
+"markiert sind, wie das Debian-Backports-Archiv seit <literal>squeeze-"
+"backports</literal>."
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:121
@@ -8082,9 +8237,18 @@ msgstr ""
 #| 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 "
+<<<<<<< TREE
 #| "uninstalled package versions, expect versions coming from archives which "
+=======
+#| "uninstalled package versions, except versions coming from archives which "
+>>>>>>> MERGE-SOURCE
 #| "in their <filename>Release</filename> files are marked as \"NotAutomatic: "
+<<<<<<< TREE
 #| "yes\" - these versions get the priority 1."
+=======
+#| "yes\" - these versions get the priority 1 or priority 100 if it is "
+#| "additionally marked as \"ButAutomaticUpgrades: yes\"."
+>>>>>>> MERGE-SOURCE
 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 "
@@ -8096,8 +8260,10 @@ msgstr ""
 "Wenn das Ziel-Release nicht angegeben wurde, dann weist APT einfach allen "
 "installierten Paketversionen eine Priorität von 100 und allen nicht "
 "installierten Paketversionen eine Priorität von 500 zu, außer wenn Versionen "
-"aus Archiven kommen, in deren Release-Dateien »NotAutomatic: yes« markiert "
-"ist – diese Versionen erhalten die Prirität 1."
+"aus Archiven kommen, die in deren <filename>Release<filename>-Dateien "
+"»NotAutomatic: yes« markiert sind – diese Versionen erhalten die Priorität 1 "
+"oder die Priorität 100, falls sie zusätzlich als »ButAutomaticUpgrades: yes« "
+"markiert sind."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:139
@@ -8399,7 +8565,11 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:262
 msgid "Regular expressions and glob() syntax"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "Reguläre Ausdrücke und glob()-Syntax"
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:264
@@ -8407,61 +8577,114 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
+<<<<<<< TREE
+=======
+"APT unterstützt außerdem Pinning mittels glob()-Ausdrücken und regulären "
+"Ausdrücken, die von »/« umschlossen sind. Das folgende Beispiel weist "
+"beispielsweise allen Paketen aus Experimental die Priorität 500 zu, bei "
+"denen der Name mit »gnome« beginnt (wie ein glob()-artiger Ausdruck) oder "
+"das Wort »kde« enthält (wie ein erweiterter regulärer POSIX-Ausdruck, der "
+"von Schrägstrichen umschlossen wird)."
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:273
+<<<<<<< TREE
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
 #| "Pin: release a=unstable\n"
 #| "Pin-Priority: 50\n"
+=======
+#, no-wrap
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Package: gnome* /kde/\n"
 "Pin: release n=experimental\n"
 "Pin-Priority: 500\n"
 msgstr ""
+<<<<<<< TREE
 "Package: *\n"
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
+=======
+"Package: gnome* /kde/\n"
+"Pin: release n=experimental\n"
+"Pin-Priority: 500\n"
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
+<<<<<<< TREE
+=======
+"Die Regel für diese Ausdrücke ist, dass sie überall dort auftreten können, "
+"wo eine Zeichenkette auftreten kann. Somit weist die folgende Pin allen "
+"Paketen von einem Release seit Karmic die Priorität 900 zu."
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><programlisting>
 #: apt_preferences.5.xml:285
+<<<<<<< TREE
 #, fuzzy, no-wrap
 #| msgid ""
 #| "Package: *\n"
 #| "Pin: release a=unstable\n"
 #| "Pin-Priority: 50\n"
+=======
+#, no-wrap
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Package: *\n"
 "Pin: release n=karmic*\n"
 "Pin-Priority: 990\n"
 msgstr ""
 "Package: *\n"
+<<<<<<< TREE
 "Pin: release a=unstable\n"
 "Pin-Priority: 50\n"
+=======
+"Pin: release n=karmic*\n"
+"Pin-Priority: 990\n"
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><literal>
 #: apt_preferences.5.xml:290
+<<<<<<< TREE
 #, fuzzy
 #| msgid "Packages"
+=======
+>>>>>>> MERGE-SOURCE
 msgid "Package"
+<<<<<<< TREE
 msgstr "Packages"
+=======
+msgstr "Package"
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><literal>
 #: apt_preferences.5.xml:296
 msgid "*"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "*"
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:306
@@ -9287,14 +9510,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 "
@@ -9310,8 +9525,10 @@ msgstr ""
 "Das Format ist das gleiche wie für die normale <filename>sources.list</"
 "filename>-Datei. Dateinamen müssen mit <filename>.list</filename> enden und "
 "können nur Buchstaben (a-z und A-Z), Ziffern (0-9), Unterstriche (_), "
-"Bindestriche (-) und Punkte (.) enthalten. Ansonsten werden sie "
-"stillschweigend ignoriert."
+"Bindestriche (-) und Punkte (.) enthalten. Andernfalls wird APT einen "
+"Hinweis ausgeben, dass es eine Datei ignoriert hat, falls die Datei nicht "
+"auf ein Muster in der Konfigurationsliste <literal>Dir::Ignore-Files-"
+"Silently</literal> passt – in diesem Fall wird sie stillschweigend ignoriert."
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:65
@@ -9320,17 +9537,6 @@ msgstr "Die Typen deb und deb-src"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
-#| "<literal>deb-src</literal> type describes a debian distribution's source "
-#| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
-#| "src</literal> line is required to fetch source indexes."
 msgid ""
 "The <literal>deb</literal> type describes a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. Typically, "
@@ -9345,14 +9551,14 @@ msgid ""
 msgstr ""
 "Der <literal>deb</literal>-Typ beschreibt ein typisches zweistufiges Debian-"
 "Archiv, <filename>Distribution/Komponente</filename>. <literal>Distribution</"
-"literal> ist typischerweise entweder <literal>stable</literal>, "
-"<literal>unstable</literal> oder <literal>testing</literal>, während "
-"Komponente entweder <literal>main</literal>, <literal>contrib</literal>, "
-"<literal>non-free</literal> oder <literal>non-us</literal> ist. Der "
-"<literal>deb-src</literal>-Typ beschreibt einen Quellcode einer Debian-"
-"Distribution in der gleichen Form wie den <literal>deb</literal>-Typ. Eine "
-"<literal>deb-src</literal>-Zeile wird benötigt, um Quellindizes "
-"herunterzuladen."
+"literal> ist typischerweise ein Archivname wie <literal>stable</literal> "
+"oder <literal>testing</literal> oder ein Kodename wie <literal>&stable-"
+"codename;</literal> oder <literal>&testing-codename;</literal> während "
+"Komponente entweder <literal>main</literal>, <literal>contrib</literal> oder "
+"<literal>non-free</literal> ist. Der <literal>deb-src</literal>-Typ "
+"beschreibt den Quellcode einer Debian-Distribution in der gleichen Form wie "
+"den <literal>deb</literal>-Typ. Eine <literal>deb-src</literal>-Zeile wird "
+"benötigt, um Quellindizes herunterzuladen."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:78
@@ -9705,22 +9911,12 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml:230
-#, fuzzy, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+#, no-wrap
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
-msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
+msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:223
-#, 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] <placeholder type=\"literallayout\" "
-#| "id=\"0\"/>"
 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</"
@@ -9730,14 +9926,14 @@ msgid ""
 "archives are not structured like this] <placeholder type=\"literallayout\" "
 "id=\"0\"/>"
 msgstr ""
-"Benutzt HTTP, um auf das Archiv auf nonus.debian.org unter dem debian-non-US-"
+"Benutzt HTTP, um auf das Archiv auf ftp.tlh.debian.org unter dem universe-"
 "Verzeichnis zuzugreifen und benutzt nur Dateien, die unter "
 "<filename>unstable/binary-i386</filename> auf i386-Maschinen, "
-"<filename>unstable/binary-m68k</filename> auf m68k und so weiter für andere "
-"unterstützte Architekturen, gefunden werden. [Beachten Sie, dass dieses "
-"Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt wird. "
-"»non-us« ist nicht länger so strukturiert] <placeholder type=\"literallayout"
-"\" id=\"0\"/>"
+"<filename>unstable/binary-amd64</filename> auf amd64 und so weiter für "
+"andere unterstützte Architekturen, gefunden werden. [Beachten Sie, dass "
+"dieses Beispiel nur anschaulich macht, wie die Platzhaltervariable benutzt "
+"wird. Offizielle Debian-Archive sind nicht so strukturiert.] <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:235
diff --git a/doc/po/es.po b/doc/po/es.po
index 2e0bda88b..74a0807c3 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -36,7 +36,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-08-25 03:25+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1354,7 +1358,11 @@ msgstr ""
 "configuración: <literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1380,12 +1388,20 @@ msgstr ""
 "Opción de configuración: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1466,9 +1482,16 @@ msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:317
+#, 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 twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1500,7 +1523,11 @@ msgstr ""
 "Opción de configuración: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1617,7 +1644,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1635,7 +1666,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1649,7 +1684,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnósticos"
@@ -1784,7 +1823,11 @@ msgid "Options"
 msgstr "Opciones"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2041,7 +2084,11 @@ msgid "Just show the contents of the configuration space."
 msgstr "Sólo muestra el contenido del espacio de configuración."
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3214,11 +3261,19 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
-msgstr ""
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+<<<<<<< TREE
 "Los valores para los campos de metadatos adicionales en el fichero «Release» "
 "se toman de las variables correspondientes en <literal>APT::FTPArchive::"
 "Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</"
@@ -3227,14 +3282,24 @@ msgstr ""
 "literal>, <literal>Codename</literal>, <literal>Date</literal>, "
 "<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal> y <literal>Description</literal>."
+=======
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3243,7 +3308,11 @@ msgstr ""
 "«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3257,12 +3326,20 @@ msgstr ""
 "configuración. Opción de configuración: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3275,12 +3352,20 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3297,12 +3382,20 @@ msgstr ""
 "Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3313,12 +3406,20 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3327,12 +3428,20 @@ msgstr ""
 "Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3346,12 +3455,20 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3375,12 +3492,20 @@ msgstr ""
 "comprobaciones adicionales son innecesarias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3396,19 +3521,31 @@ msgstr ""
 "con la orden «generate»."
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Ejemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3417,7 +3554,11 @@ msgstr ""
 "paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3890,7 +4031,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5582,11 +5723,12 @@ msgstr ""
 #| "period (.) characters - otherwise they will be silently ignored."
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 "Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
 "alfanumérico ascendente que no tienen extensión o la extensión "
@@ -6615,9 +6757,9 @@ 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 "
+"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 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 "
@@ -6639,7 +6781,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -7932,8 +8074,8 @@ msgstr ""
 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 (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8401,7 +8543,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -8425,7 +8571,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 0c6a75aae..3b0f486b1 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2011-02-17 07:50+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1277,7 +1281,11 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1304,12 +1312,20 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1391,9 +1407,16 @@ msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:317
+#, 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 twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1425,7 +1448,11 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1545,7 +1572,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1563,7 +1594,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1577,7 +1612,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnostics"
@@ -1712,7 +1751,11 @@ msgid "Options"
 msgstr "Options"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -1969,7 +2012,11 @@ msgid "Just show the contents of the configuration space."
 msgstr "Affiche seulement le contenu de l'espace de configuration."
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3142,11 +3189,19 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
-msgstr ""
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+<<<<<<< TREE
 "La valeur des autres champs de métadonnées du fichier Release sont tirées de "
 "la valeur correspondante dans <literal>APT::FTPArchive::Release</literal>, "
 "p. ex. <literal>APT::FTPArchive::Release::Origin</literal>.  Les champs "
@@ -3155,14 +3210,24 @@ msgstr ""
 "literal>, <literal>Date</literal>, <literal>Valid-Until</literal>, "
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
+=======
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3172,7 +3237,11 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3187,12 +3256,20 @@ msgstr ""
 "configuration : <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3206,12 +3283,20 @@ msgstr ""
 "literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3227,12 +3312,20 @@ msgstr ""
 "de configuration : <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3243,12 +3336,20 @@ msgstr ""
 "FTPArchive::SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3257,12 +3358,20 @@ msgstr ""
 "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3276,12 +3385,20 @@ msgstr ""
 "<literal>APT::FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3304,12 +3421,20 @@ msgstr ""
 "survenir et l'ensemble de ces contrôles devient inutile."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3325,19 +3450,31 @@ msgstr ""
 "generate."
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Exemples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3346,7 +3483,11 @@ msgstr ""
 "des paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3822,7 +3963,7 @@ msgstr "download"
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 "<literal>download</literal> télécharge le fichier binaire indiqué dans le "
 "répertoire courant."
@@ -5497,13 +5638,23 @@ 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 APT will print a notice that it has "
+#| "ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+#| "Ignore-Files-Silently</literal> configuration list - in this case it will "
+#| "be silently ignored."
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 "tous les fichiers de <literal>Dir::Etc::Parts</literal> dans l'ordre "
 "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
@@ -6539,13 +6690,25 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
+#, 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 "
+#| "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 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 "
+"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 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 "
@@ -6567,7 +6730,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 "Le type spécial <literal>uncompressed</literal> peut servir à donner la "
@@ -7855,11 +8018,21 @@ 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 APT will "
+#| "print a notice that it has ignored a file if the file doesn't match a "
+#| "pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
+#| "configuration list - in this case it 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 "
-"following naming convention: The files have no or \"<literal>pref</literal>"
-"\" as filename extension and which only contain alphanumeric, hyphen (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8325,7 +8498,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -8349,7 +8526,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/it.po b/doc/po/it.po
index 3056b4c05..1b92632a7 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -9,7 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -934,7 +938,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr ""
@@ -955,12 +963,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1035,7 +1051,7 @@ msgstr ""
 #: apt-cache.8.xml:317
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1059,7 +1075,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr ""
 
@@ -1155,7 +1175,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr ""
@@ -1173,7 +1197,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1187,7 +1215,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
@@ -1292,7 +1324,11 @@ msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1496,7 +1532,11 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr ""
@@ -2419,26 +2459,45 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2447,12 +2506,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2461,12 +2528,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2476,12 +2551,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2489,24 +2572,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2515,12 +2614,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2534,12 +2641,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2549,26 +2664,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2897,7 +3028,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4174,11 +4305,12 @@ msgstr ""
 #: apt.conf.5.xml:52
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -4876,9 +5008,9 @@ 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 "
+"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 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 "
@@ -4889,7 +5021,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -5830,8 +5962,8 @@ msgstr ""
 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 (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -6159,7 +6291,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -6176,7 +6312,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 53cdb6555..0446b0827 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -7,7 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1357,7 +1361,11 @@ msgstr ""
 "pkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1384,12 +1392,20 @@ msgstr ""
 "<literal>Dir::Cache::srcpkgcache</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1475,7 +1491,7 @@ msgstr "<option>--no-enhances</option>"
 #, 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 "
+"print all dependencies. This can be tweaked 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>."
@@ -1505,7 +1521,11 @@ msgstr ""
 "ShowFull</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1627,7 +1647,11 @@ msgstr ""
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1647,7 +1671,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1663,7 +1691,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "診断メッセージ"
@@ -1805,7 +1837,11 @@ msgid "Options"
 msgstr "オプション"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2075,7 +2111,11 @@ msgstr "設定箇所の内容を表示するだけです。"
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3308,11 +3348,19 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
-msgstr ""
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+<<<<<<< TREE
 "Release ファイルの追加メタデータフィールドの値は、<literal>APT::FTPArchive::"
 "Release</literal> 以下の相当する値 (例: <literal>APT::FTPArchive::Release::"
 "Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
@@ -3320,15 +3368,25 @@ msgstr ""
 "<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
 "literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
 "<literal>Components</literal>, <literal>Description</literal> です。"
+=======
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3338,7 +3396,11 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3351,13 +3413,21 @@ msgstr ""
 "<literal>quiet</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3370,13 +3440,21 @@ msgstr ""
 "<literal>APT::FTPArchive::DeLinkAct</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3391,13 +3469,21 @@ msgstr ""
 "<literal>APT::FTPArchive::Contents</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3407,13 +3493,21 @@ msgstr ""
 "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3422,13 +3516,21 @@ msgstr ""
 "FTPArchive::ReadOnlyDB</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
@@ -3442,12 +3544,20 @@ msgstr ""
 "literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3461,12 +3571,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
@@ -3482,14 +3600,22 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><title>
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "サンプル"
 
 # type: Content of: <refentry><refsect1><para><programlisting>
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
@@ -3498,7 +3624,11 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3508,7 +3638,11 @@ msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3984,7 +4118,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5730,11 +5864,12 @@ msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存�
 #| "period (.) characters - otherwise they will be silently ignored."
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 "<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
 "ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
@@ -6729,9 +6864,9 @@ 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 "
+"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 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 "
@@ -6751,7 +6886,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -7887,8 +8022,8 @@ msgstr ""
 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 (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8353,7 +8488,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -8379,7 +8518,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 1f8e275b1..b401a1ed1 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -10,7 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-03-18 22:00+0100\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: <debian-l10n-polish@lists.debian.org>\n"
@@ -1363,7 +1367,11 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1391,12 +1399,20 @@ msgstr ""
 "Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1503,7 +1519,7 @@ msgstr "<option>--no-act</option>"
 #| "<literal>APT::Cache::RecurseDepends</literal>."
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1534,7 +1550,11 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1660,7 +1680,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1678,7 +1702,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1693,7 +1721,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnostyka"
@@ -1842,7 +1874,11 @@ msgid "Options"
 msgstr "Opcje"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -2105,7 +2141,11 @@ msgid "Just show the contents of the configuration space."
 msgstr "Wyświetla zawartość przestrzeni konfiguracji."
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3106,20 +3146,35 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
@@ -3130,7 +3185,11 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3144,13 +3203,21 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
@@ -3164,12 +3231,20 @@ msgstr ""
 "<literal>APT::Cache::Generate</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3179,13 +3254,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
@@ -3197,13 +3280,21 @@ msgstr ""
 "konfiguracyjnym: <literal>APT::Cache::Installed</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
@@ -3213,14 +3304,22 @@ msgstr ""
 "pliku konfiguracyjnym: <literal>APT::Cache::NamesOnly</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 #| msgid "<option>-a</option>"
 msgid "<option>--arch</option>"
 msgstr "<option>-a</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 #| msgid ""
 #| "If the command is either <literal>install</literal> or <literal>remove</"
@@ -3240,13 +3339,21 @@ msgstr ""
 "AutomaticRemove</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3260,13 +3367,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 #, fuzzy
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>--version</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3276,19 +3391,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Przykłady"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> packages <replaceable>katalog</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3296,7 +3423,11 @@ msgstr ""
 
 #
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3833,7 +3964,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 #
@@ -5456,14 +5587,29 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:52
+#, 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 ""
 "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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
+"Katalog <filename>/etc/apt/sources.list.d</filename>  umożliwia podzielenie "
+"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
+"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w "
+"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i "
+"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia "
+"(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:59
@@ -6168,9 +6314,9 @@ 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 "
+"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 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 "
@@ -6181,7 +6327,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -7137,16 +7283,30 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:70
+#, 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 ""
 "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 (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
 "case it will be silently ignored."
 msgstr ""
+"Katalog <filename>/etc/apt/sources.list.d</filename>  umożliwia podzielenie "
+"pliku źródeł na osobne pliki. Format jest dokładnie taki sam, jak w "
+"przypadku zwykłego pliku <filename>sources.list</filename>. Nazwy plików w "
+"tym katalogu muszą się kończyć rozszerzeniem <filename>.list</filename> i "
+"mogą składać się tylko z liter (a-z i A-Z), cyfr (0-9), znaku podkreślenia "
+"(_), pauzy (-) i kropki (.). Inne pliki zostaną zignorowane."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:79
@@ -7497,7 +7657,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -7521,7 +7685,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 87ed16033..7ee9c17de 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -6,7 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.8.0~pre1\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2010-08-25 23:07+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1306,7 +1310,11 @@ msgstr ""
 "<literal>Dir::Cache::pkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr "<option>-s</option>"
@@ -1332,12 +1340,20 @@ msgstr ""
 "pacote. Item de Configuração: <literal>Dir::Cache::srcpkgcache</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr "<option>-q</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr "<option>--quiet</option>"
 
@@ -1418,9 +1434,16 @@ msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:317
+#, 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 twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1451,7 +1474,11 @@ msgstr ""
 "<literal>APT::Cache::ShowFull</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr "<option>-a</option>"
 
@@ -1568,7 +1595,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr "&apt-commonoptions;"
@@ -1586,7 +1617,11 @@ msgstr "&file-sourceslist; &file-statelists;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1600,7 +1635,11 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr "Diagnóstico"
@@ -1735,7 +1774,11 @@ msgid "Options"
 msgstr "Opções"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr "<option>-d</option>"
 
@@ -1988,7 +2031,11 @@ msgid "Just show the contents of the configuration space."
 msgstr "Apenas mostra o conteúdo do espaço de configuração."
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 msgid "&apt-conf;"
 msgstr "&apt-conf;"
@@ -3153,11 +3200,19 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
-msgstr ""
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
+msgstr ""
+<<<<<<< TREE
 "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>.  "
@@ -3166,14 +3221,24 @@ msgstr ""
 "<literal>Codename</literal>, <literal>Date</literal>, "
 "<literal>Architectures</literal>, <literal>Components</literal>, "
 "<literal>Description</literal>."
+=======
+>>>>>>> MERGE-SOURCE
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr "<option>--db</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
@@ -3182,7 +3247,11 @@ msgstr ""
 "generate. Item de configuração: <literal>APT::FTPArchive::DB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -3196,12 +3265,20 @@ msgstr ""
 "<literal>quiet</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr "<option>--delink</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -3214,12 +3291,20 @@ msgstr ""
 "option>. Item de Configuração: <literal>APT::FTPArchive::DeLinkAct</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr "<option>--contents</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -3235,12 +3320,20 @@ msgstr ""
 "de Configuração: <literal>APT::FTPArchive::Contents</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr "<option>--source-override</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -3251,12 +3344,20 @@ msgstr ""
 "SourceOverride</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr "<option>--readonly</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
@@ -3265,12 +3366,20 @@ msgstr ""
 "<literal>APT::FTPArchive::ReadOnlyDB</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr "<option>--arch</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -3284,12 +3393,20 @@ msgstr ""
 "FTPArchive::Architecture</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -3313,12 +3430,20 @@ msgstr ""
 "as verificações extras serão desnecessárias."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3333,19 +3458,31 @@ msgstr ""
 "<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 msgid "Examples"
 msgstr "Examples"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr "<command>apt-ftparchive</command> pacotes <replaceable>directório</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -3354,7 +3491,11 @@ msgstr ""
 "pacotes binários (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -3824,7 +3965,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -5505,11 +5646,12 @@ msgstr ""
 #| "period (.) characters - otherwise they will be silently ignored."
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will 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 "
@@ -6530,9 +6672,9 @@ 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 "
+"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 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 "
@@ -6553,7 +6695,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -7828,8 +7970,8 @@ msgstr ""
 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 (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -8295,7 +8437,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -8319,7 +8465,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 4f85c98b0..422fb43d2 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2011-06-09 08:32+0530\n"
+=======
+"POT-Creation-Date: 2011-06-28 16:42+0200\n"
+>>>>>>> MERGE-SOURCE
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -984,7 +988,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:288 apt-ftparchive.1.xml:571 apt-get.8.xml:393
+=======
+#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:393
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:61
 msgid "<option>-s</option>"
 msgstr ""
@@ -1005,12 +1013,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>-q</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:296 apt-ftparchive.1.xml:545 apt-get.8.xml:383
+=======
+#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:383
+>>>>>>> MERGE-SOURCE
 msgid "<option>--quiet</option>"
 msgstr ""
 
@@ -1085,7 +1101,7 @@ msgstr ""
 #: apt-cache.8.xml:317
 msgid ""
 "Per default the <literal>depends</literal> and <literal>rdepends</literal> "
-"print all dependencies. This can be twicked with these flags which will omit "
+"print all dependencies. This can be tweaked 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>."
@@ -1109,7 +1125,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:583
+=======
+#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>-a</option>"
 msgstr ""
 
@@ -1205,7 +1225,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:611 apt-get.8.xml:570
+=======
+#: apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:570
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
 msgid "&apt-commonoptions;"
 msgstr ""
@@ -1223,7 +1247,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:627 apt-get.8.xml:585
+=======
+#: apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:585
+>>>>>>> MERGE-SOURCE
 #: apt-key.8.xml:193 apt-mark.8.xml:150 apt-secure.8.xml:185
 #: apt-sortpkgs.1.xml:72 apt.conf.5.xml:1099 apt_preferences.5.xml:704
 #: sources.list.5.xml:234
@@ -1238,7 +1266,11 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111
+<<<<<<< TREE
 #: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:631 apt-get.8.xml:591
+=======
+#: apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:591
+>>>>>>> MERGE-SOURCE
 #: apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
 msgid "Diagnostics"
 msgstr ""
@@ -1343,7 +1375,11 @@ msgid "Options"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:539 apt-get.8.xml:345
+=======
+#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:345
+>>>>>>> MERGE-SOURCE
 msgid "<option>-d</option>"
 msgstr ""
 
@@ -1548,7 +1584,11 @@ msgid "Just show the contents of the configuration space."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:628
+=======
+#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629
+>>>>>>> MERGE-SOURCE
 #: apt-sortpkgs.1.xml:73
 #, fuzzy
 msgid "&apt-conf;"
@@ -2478,26 +2518,45 @@ msgid ""
 "Configuration Items: <literal>APT::FTPArchive::<replaceable>Checksum</"
 "replaceable></literal> and <literal>APT::FTPArchive::<replaceable>Index</"
 "replaceable>::<replaceable>Checksum</replaceable></literal> where "
+<<<<<<< TREE
 "<literal>Index</literal> can be <literal>Packages</literal>, "
 "<literal>Sources</literal> or <literal>Release</literal> and "
 "<literal>Checksum</literal> can be <literal>MD5</literal>, <literal>SHA1</"
 "literal> or <literal>SHA256</literal>."
+=======
+"<literal><replaceable>Index</replaceable></literal> can be "
+"<literal>Packages</literal>, <literal>Sources</literal> or <literal>Release</"
+"literal> and <literal><replaceable>Checksum</replaceable></literal> can be "
+"<literal>MD5</literal>, <literal>SHA1</literal> or <literal>SHA256</literal>."
+>>>>>>> MERGE-SOURCE
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:539
+=======
+#: apt-ftparchive.1.xml:540
+>>>>>>> MERGE-SOURCE
 msgid "<option>--db</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:541
+=======
+#: apt-ftparchive.1.xml:542
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Use a binary caching DB. This has no effect on the generate command.  "
 "Configuration Item: <literal>APT::FTPArchive::DB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:547
+=======
+#: apt-ftparchive.1.xml:548
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Quiet; produces output suitable for logging, omitting progress indicators.  "
 "More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -2506,12 +2565,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:553
+=======
+#: apt-ftparchive.1.xml:554
+>>>>>>> MERGE-SOURCE
 msgid "<option>--delink</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:555
+=======
+#: apt-ftparchive.1.xml:556
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform Delinking. If the <literal>External-Links</literal> setting is used "
 "then this option actually enables delinking of the files. It defaults to on "
@@ -2520,12 +2587,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:561
+=======
+#: apt-ftparchive.1.xml:562
+>>>>>>> MERGE-SOURCE
 msgid "<option>--contents</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:563
+=======
+#: apt-ftparchive.1.xml:564
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Perform contents generation. When this option is set and package indexes are "
 "being generated with a cache DB then the file listing will also be extracted "
@@ -2535,12 +2610,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:571
+=======
+#: apt-ftparchive.1.xml:572
+>>>>>>> MERGE-SOURCE
 msgid "<option>--source-override</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:573
+=======
+#: apt-ftparchive.1.xml:574
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Select the source override file to use with the <literal>sources</literal> "
 "command.  Configuration Item: <literal>APT::FTPArchive::SourceOverride</"
@@ -2548,24 +2631,40 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:577
+=======
+#: apt-ftparchive.1.xml:578
+>>>>>>> MERGE-SOURCE
 msgid "<option>--readonly</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:579
+=======
+#: apt-ftparchive.1.xml:580
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Make the caching databases read only.  Configuration Item: <literal>APT::"
 "FTPArchive::ReadOnlyDB</literal>."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:583
+=======
+#: apt-ftparchive.1.xml:584
+>>>>>>> MERGE-SOURCE
 msgid "<option>--arch</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:584
+=======
+#: apt-ftparchive.1.xml:585
+>>>>>>> MERGE-SOURCE
 msgid ""
 "Accept in the <literal>packages</literal> and <literal>contents</literal> "
 "commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2574,12 +2673,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:590
+=======
+#: apt-ftparchive.1.xml:591
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::AlwaysStat</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:592
+=======
+#: apt-ftparchive.1.xml:593
+>>>>>>> MERGE-SOURCE
 msgid ""
 "&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
 "packages are recompiled and/or republished with the same version again, this "
@@ -2593,12 +2700,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:602
+=======
+#: apt-ftparchive.1.xml:603
+>>>>>>> MERGE-SOURCE
 msgid "<option>APT::FTPArchive::LongDescription</option>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:604
+=======
+#: apt-ftparchive.1.xml:605
+>>>>>>> MERGE-SOURCE
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2608,27 +2723,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:616 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+=======
+#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1087 apt_preferences.5.xml:544
+>>>>>>> MERGE-SOURCE
 #: sources.list.5.xml:198
 #, fuzzy
 msgid "Examples"
 msgstr "Exemplos"
 
 #. type: Content of: <refentry><refsect1><para><programlisting>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:622
+=======
+#: apt-ftparchive.1.xml:623
+>>>>>>> MERGE-SOURCE
 #, no-wrap
 msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:618
+=======
+#: apt-ftparchive.1.xml:619
+>>>>>>> MERGE-SOURCE
 msgid ""
 "To create a compressed Packages file for a directory containing binary "
 "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
+<<<<<<< TREE
 #: apt-ftparchive.1.xml:632
+=======
+#: apt-ftparchive.1.xml:633
+>>>>>>> MERGE-SOURCE
 msgid ""
 "<command>apt-ftparchive</command> returns zero on normal operation, decimal "
 "100 on error."
@@ -2951,7 +3082,7 @@ msgstr ""
 #: apt-get.8.xml:282
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
-"current directoy."
+"current directory."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4232,11 +4363,12 @@ msgstr ""
 #: apt.conf.5.xml:52
 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 APT will print a notice that it has ignored a file if "
-"the file doesn't match a pattern in the <literal>Dir::Ignore-Files-Silently</"
-"literal> configuration list - in this case it will be silently ignored."
+"order which have either no or \"<literal>conf</literal>\" as filename "
+"extension and which only contain alphanumeric, hyphen (-), underscore (_) "
+"and period (.) characters.  Otherwise APT will print a notice that it has "
+"ignored a file if the file doesn't match a pattern in the <literal>Dir::"
+"Ignore-Files-Silently</literal> configuration list - in this case it will be "
+"silently ignored."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
@@ -4934,9 +5066,9 @@ 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 "
+"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 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 "
@@ -4947,7 +5079,7 @@ msgstr ""
 #: apt.conf.5.xml:449
 msgid ""
 "The special type <literal>uncompressed</literal> can be used to give "
-"uncompressed files a preference, but note that most archives doesn't provide "
+"uncompressed files a preference, but note that most archives don't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
 
@@ -5931,8 +6063,8 @@ msgstr ""
 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 (-), "
+"following naming convention: The files have either no or \"<literal>pref</"
+"literal>\" as filename extension and only contain alphanumeric, hyphen (-), "
 "underscore (_) and period (.) characters.  Otherwise APT will print a notice "
 "that it has ignored a file if the file doesn't match a pattern in the "
 "<literal>Dir::Ignore-Files-Silently</literal> configuration list - in this "
@@ -6396,7 +6528,11 @@ msgid ""
 "APT also supports pinning by glob() expressions and regular expressions "
 "surrounded by /. For example, the following example assigns the priority 500 "
 "to all packages from experimental where the name starts with gnome (as a glob"
+<<<<<<< TREE
 "()-like expression or contains the word kde (as a POSIX extended regular "
+=======
+"()-like expression) or contains the word kde (as a POSIX extended regular "
+>>>>>>> MERGE-SOURCE
 "expression surrounded by slashes)."
 msgstr ""
 
@@ -6417,7 +6553,11 @@ msgstr ""
 #: apt_preferences.5.xml:279
 msgid ""
 "The rule for those expressions is that they can occur anywhere where a "
+<<<<<<< TREE
 "string can occur. Those, the following pin assigns the priority 990 to all "
+=======
+"string can occur. Thus, the following pin assigns the priority 990 to all "
+>>>>>>> MERGE-SOURCE
 "packages from a release starting with karmic."
 msgstr ""
 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 837f07683..fab125b4e 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -78,7 +78,7 @@
    <para>The format for a <filename>sources.list</filename> entry using the
    <literal>deb</literal> and <literal>deb-src</literal> types is:</para>
 
-   <literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
+   <literallayout>deb [ options ] uri distribution [component1] [component2] [...]</literallayout>
 
    <para>The URI for the <literal>deb</literal> type must specify the base of the
    Debian distribution, from which APT will find the information it needs. 
@@ -109,6 +109,17 @@
    simultaneous anonymous users. APT also parallelizes connections to 
    different hosts to more effectively deal with sites with low bandwidth.</para>
 
+   <para><literal>options</literal> is always optional and needs to be surounded by
+   square brackets. It can consist of multiple settings in the form
+   <literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>.
+   Multiple settings are separated by spaces. The following settings are supported by APT,
+   note through that unsupported settings will be ignored silently:
+   <itemizedlist><listitem><para><literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal>
+   can be used to specify for which architectures packages information should
+   be downloaded. If this option is not set all architectures defined by the
+   <literal>APT::Architectures</literal> option will be downloaded.</para>
+   </listitem></itemizedlist></para>
+
    <para>It is important to list sources in order of preference, with the most
    preferred source listed first. Typically this will result in sorting
    by speed from fastest to slowest (CD-ROM followed by hosts on a local
@@ -206,6 +217,11 @@ deb http://security.debian.org/ &stable-codename;/updates main contrib non-free
    <para>Source line for the above</para>
    <literallayout>deb-src file:/home/jason/debian unstable main contrib non-free</literallayout>
 
+   <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal>
+   while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para>
+   <literallayout>deb http://ftp.debian.org/debian &stable-codename; main
+deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main</literallayout>
+
    <para>Uses HTTP to access the archive at archive.debian.org, and uses only
    the hamm/main area.</para>
    <literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index efe1f73f7..960c06180 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -65,13 +65,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       return string("Couldn't spawn new process") + strerror(errno);
    else if (pid == 0)
    {
-      if (SigVerify::RunGPGV(outfile, file, 3, fd) == false)
+      _error->PushToStack();
+      bool const success = SigVerify::RunGPGV(outfile, file, 3, fd);
+      if (success == false)
       {
-	 // TRANSLATOR: %s is the trusted keyring parts directory
-	 ioprintf(ret, _("No keyring installed in %s."),
-		  _config->FindDir("Dir::Etc::TrustedParts").c_str());
-	 return ret.str();
+	 string errmsg;
+	 _error->PopMessage(errmsg);
+	 _error->RevertToStack();
+	 return errmsg;
       }
+      _error->RevertToStack();
       exit(111);
    }
    close(fd[1]);
diff --git a/methods/http.h b/methods/http.h
index 0bc019e77..aa96c6810 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -182,7 +182,7 @@ class HttpMethod : public pkgAcqMethod
    string AutoDetectProxyCmd;
 
    public:
-   friend class ServerState;
+   friend struct ServerState;
 
    FileFd *File;
    ServerState *Server;
diff --git a/methods/mirror.cc b/methods/mirror.cc
index 2cf5c9ce1..713dc211a 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -134,6 +134,10 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    string fetch = BaseUri;
    fetch.replace(0,strlen("mirror://"),"http://");
 
+   // append the dist as a query string
+   if (Dist != "")
+      fetch += "?dist=" + Dist;
+
    if(Debug)
       clog << "MirrorMethod::DownloadMirrorFile(): '" << fetch << "'"
            << " to " << MirrorFile << endl;
@@ -274,8 +278,18 @@ bool MirrorMethod::InitMirrors()
    while (!in.eof()) 
    {
       getline(in, s);
-      if (s.size() > 0)
-	 AllMirrors.push_back(s);
+
+      // ignore lines that start with #
+      if (s.find("#") == 0)
+         continue;
+      // ignore empty lines
+      if (s.size() == 0)
+         continue;
+      // ignore non http lines
+      if (s.find("http://") != 0)
+         continue;
+
+      AllMirrors.push_back(s);
    }
    Mirror = AllMirrors[0];
    UsedMirror = Mirror;
@@ -329,6 +343,7 @@ string MirrorMethod::GetMirrorFileName(string mirror_uri_str)
 	 if(Debug)
 	    std::cerr << "found BaseURI: " << uristr << std::endl;
 	 BaseUri = uristr.substr(0,uristr.size()-1);
+         Dist = (*I)->GetDist();
       }
    }
    // get new file
diff --git a/methods/mirror.h b/methods/mirror.h
index bd807e122..97d18144a 100644
--- a/methods/mirror.h
+++ b/methods/mirror.h
@@ -29,6 +29,7 @@ class MirrorMethod : public HttpMethod
    vector<string> AllMirrors; // all available mirrors
    string MirrorFile; // the file that contains the list of mirrors
    bool DownloadedMirrorFile; // already downloaded this session
+   string Dist;       // the target distrubtion (e.g. sid, oneiric)
 
    bool Debug;
 
diff --git a/po/ca.po b/po/ca.po
index 990f85555..122005dae 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,23 +1,22 @@
 # Catalan translation of APT.
-# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009 Software in the Public Interest, Inc.
+# Copyright © 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2011 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.
+# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009, 2011.
 # Agustí Grau <fletxa@gmail.com>, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 0.7.22\n"
+"Project-Id-Version: apt 0.8.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-15 06:09+0100\n"
-"PO-Revision-Date: 2010-09-02 11:51+0100\n"
-"Last-Translator: Agustí Grau <fletxa@gmail.com>\n"
+"POT-Creation-Date: 2011-01-12 17:42+0100\n"
+"PO-Revision-Date: 2011-06-16 01:41+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-Generator: Virtaal 0.6.1\n"
 
 #: cmdline/apt-cache.cc:156
 #, c-format
@@ -30,7 +29,7 @@ msgstr "Nombre total de paquets: "
 
 #: cmdline/apt-cache.cc:286
 msgid "Total package structures: "
-msgstr "Total d'estructures de paquets: "
+msgstr "Nombre total d'estructures de paquets: "
 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
@@ -54,120 +53,156 @@ msgstr "  Falten: "
 
 #: cmdline/apt-cache.cc:332
 msgid "Total distinct versions: "
-msgstr "Total de versions diferents: "
+msgstr "Nombre total de versions diferents: "
 
 #: cmdline/apt-cache.cc:334
 msgid "Total distinct descriptions: "
-msgstr "Total de descripcions diferents: "
+msgstr "Nombre total de descripcions diferents: "
 
 #: cmdline/apt-cache.cc:336
 msgid "Total dependencies: "
-msgstr "Total de dependències: "
+msgstr "Nombre total de dependències: "
 
 #: cmdline/apt-cache.cc:339
 msgid "Total ver/file relations: "
-msgstr "Total de relacions versió/fitxer: "
+msgstr "Nombre total de relacions versió/fitxer: "
 
 #: cmdline/apt-cache.cc:341
 msgid "Total Desc/File relations: "
-msgstr "Total de relacions descripció/fitxer: "
+msgstr "Nombre total de relacions descripció/fitxer: "
 
 #: cmdline/apt-cache.cc:343
 msgid "Total Provides mappings: "
-msgstr "Total dels mapes aportats: "
+msgstr "Nombre total dels mapes aportats: "
 
 #: cmdline/apt-cache.cc:355
 msgid "Total globbed strings: "
-msgstr "Total de cadenes globals: "
+msgstr "Nombre total de cadenes globals: "
 
 #: cmdline/apt-cache.cc:369
 msgid "Total dependency version space: "
-msgstr "Total de l'espai per a dependències de versió: "
+msgstr "Nombre total de l'espai per a dependències de versió: "
 
 #: cmdline/apt-cache.cc:374
 msgid "Total slack space: "
-msgstr "Total de l'espai desperdiciat: "
+msgstr "Nombre total de l'espai desperdiciat: "
 
 #: cmdline/apt-cache.cc:382
 msgid "Total space accounted for: "
-msgstr "Total de l'espai atribuït a: "
+msgstr "Nombre total de l'espai atribuït a: "
 
-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "El fitxer %s del paquet està desincronitzat."
 
-#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
-#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
-msgid "No packages found"
-msgstr "No s'han trobat paquets"
-
-#: cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:1273
 msgid "You must give at least one search pattern"
 msgstr "Heu de donar com a mínim un patró de cerca"
 
-#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508
+msgid "No packages found"
+msgstr "No s'han trobat paquets"
+
+#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "No s'ha trobat el paquet %s"
 
-#: cmdline/apt-cache.cc:1481
+#: cmdline/apt-cache.cc:1533
 msgid "Package files:"
 msgstr "Fitxers de paquets:"
 
-#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Memòria cau no sincronitzada, no es pot fer x-ref a un fitxer del paquet"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1502
+#: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
 msgstr "Paquets etiquetats:"
 
-#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
 msgstr "(no trobat)"
 
-#: cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1575
 msgid "  Installed: "
-msgstr "  Instal·lat: "
+msgstr "  Instaŀlat: "
 
-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1576
 msgid "  Candidate: "
 msgstr "  Candidat: "
 
-#: cmdline/apt-cache.cc:1548 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
 msgid "(none)"
 msgstr "(cap)"
 
-#: cmdline/apt-cache.cc:1563
+#: cmdline/apt-cache.cc:1615
 msgid "  Package pin: "
 msgstr "  Etiqueta del paquet: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1572
+#: cmdline/apt-cache.cc:1624
 msgid "  Version table:"
 msgstr "  Taula de versió:"
 
-#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3047 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
 #, c-format
 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:1693
+#: cmdline/apt-cache.cc:1745
 #, fuzzy
+#| msgid ""
+#| "Usage: apt-cache [options] command\n"
+#| "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+#| "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-cache is a low-level tool used to query information\n"
+#| "from APT's binary cache files\n"
+#| "\n"
+#| "Commands:\n"
+#| "   gencaches - Build both the package and source cache\n"
+#| "   showpkg - Show some general information for a single package\n"
+#| "   showsrc - Show source records\n"
+#| "   stats - Show some basic statistics\n"
+#| "   dump - Show the entire file in a terse form\n"
+#| "   dumpavail - Print an available file to stdout\n"
+#| "   unmet - Show unmet dependencies\n"
+#| "   search - Search the package list for a regex pattern\n"
+#| "   show - Show a readable record for the package\n"
+#| "   depends - Show raw dependency information for a package\n"
+#| "   rdepends - Show reverse dependency information for a package\n"
+#| "   pkgnames - List the names of all packages in the system\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"
 msgid ""
 "Usage: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to query information\n"
-"from APT's binary cache files\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
 "\n"
 "Commands:\n"
+"   add - Add a package file to the source cache\n"
 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"
@@ -196,41 +231,39 @@ msgid ""
 "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"
+"    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 usada per a manipular fitxers binaris en\n"
-"el cau d'APT, i així poder consultar-ne la informació\n"
+"apt-cache és una eina de baix nivell emprada per consultar\n"
+"la informació dels fitxers binaris de memòria cau de l'APT.\n"
 "\n"
 "Ordres:\n"
-"   add - Afegeix un fitxer de paquet a la memòria cau de les fonts\n"
-"   gencaches - Crea la memòria cau de tots dos, paquet i font\n"
-"   showpkg - Mostra alguna informació general d'un sol paquet\n"
-"   showsrc - Mostra un registre de les fonts\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"
+"   dumpavail - Imprimeix un fitxer «available» per sortida estàndard\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 instal·lats automàticanent\n"
+"   search - Cerca un patró d'expressió regular a la llista de paquets\n"
+"   show - Mostra un registre llegible pel paquet\n"
 "   depends - Mostra informació de dependències (en cru) d'un paquet\n"
-"   rdepends - Mostra informació de dependències enrere 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 del paquet per a GraphViz\n"
-"   xvcg - Genera gràfiques del paquet per a xvcg\n"
+"   dotty - Genera gràfiques de paquets per al GraphViz\n"
+"   xvcg - Genera gràfiques de paquets per al 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'indicatiu de progres.\n"
-"  -i   Només mostra dependències importants d'una ordre inadequada.\n"
-"  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n"
-"Consulteu les pàgines del manual apt-cache(8) i apt.conf(5) per a més "
+"  -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:77
@@ -271,7 +304,7 @@ msgid ""
 msgstr ""
 "Forma d'ús: apt-config [opcions] ordre\n"
 "\n"
-"apt-config és una simple eina per a llegir el fitxer de configuració d'APT\n"
+"apt-config és una eina simple per llegir el fitxer de configuració d'APT\n"
 "\n"
 "Ordres:\n"
 "   shell - Mode shell\n"
@@ -280,7 +313,7 @@ msgstr ""
 "Opcions:\n"
 "  -h   Aquest text d'ajuda.\n"
 "  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de conf arbitrària, p.ex. -o dir::cache=/tmp\n"
+"  -o=? Estableix una opció de conf arbitrària, p. ex. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:98
 #, c-format
@@ -300,7 +333,7 @@ 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"
+"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"
@@ -311,14 +344,14 @@ msgstr ""
 "  -c=? Llegeix aquest fitxer de configuració\n"
 "  -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
 #, c-format
 msgid "Unable to write to %s"
 msgstr "No es pot escriure en %s"
 
 #: cmdline/apt-extracttemplates.cc:309
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "No es pot determinar la versió de debconf. Està instal·lat debconf?"
+msgstr "No es pot determinar la versió de debconf. Està instaŀlat debconf?"
 
 #: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
 msgid "Package extension list is too long"
@@ -667,16 +700,16 @@ msgstr "Els següents paquets tenen dependències sense satisfer:"
 #: cmdline/apt-get.cc:342
 #, c-format
 msgid "but %s is installed"
-msgstr "però està instal·lat %s"
+msgstr "però està instaŀlat %s"
 
 #: cmdline/apt-get.cc:344
 #, c-format
 msgid "but %s is to be installed"
-msgstr "però s'instal·larà %s"
+msgstr "però s'instaŀlarà %s"
 
 #: cmdline/apt-get.cc:351
 msgid "but it is not installable"
-msgstr "però no és instal·lable"
+msgstr "però no és instaŀlable"
 
 #: cmdline/apt-get.cc:353
 msgid "but it is a virtual package"
@@ -684,11 +717,11 @@ msgstr "però és un paquet virtual"
 
 #: cmdline/apt-get.cc:356
 msgid "but it is not installed"
-msgstr "però no està instal·lat"
+msgstr "però no està instaŀlat"
 
 #: cmdline/apt-get.cc:356
 msgid "but it is not going to be installed"
-msgstr "però no serà instal·lat"
+msgstr "però no serà instaŀlat"
 
 #: cmdline/apt-get.cc:361
 msgid " or"
@@ -696,7 +729,7 @@ msgstr " o"
 
 #: cmdline/apt-get.cc:392
 msgid "The following NEW packages will be installed:"
-msgstr "S'instal·laran els paquets NOUS següents:"
+msgstr "S'instaŀlaran els paquets NOUS següents:"
 
 #: cmdline/apt-get.cc:420
 msgid "The following packages will be REMOVED:"
@@ -734,12 +767,12 @@ msgstr ""
 #: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu actualitzats, %lu nous a instal·lar, "
+msgstr "%lu actualitzats, %lu nous a instaŀlar, "
 
 #: cmdline/apt-get.cc:609
 #, c-format
 msgid "%lu reinstalled, "
-msgstr "%lu reinstal·lats, "
+msgstr "%lu reinstaŀlats, "
 
 #: cmdline/apt-get.cc:611
 #, c-format
@@ -754,7 +787,7 @@ msgstr "%lu a suprimir i %lu no actualitzats.\n"
 #: cmdline/apt-get.cc:617
 #, c-format
 msgid "%lu not fully installed or removed.\n"
-msgstr "%lu no instal·lats o suprimits completament.\n"
+msgstr "%lu no instaŀlats o suprimits completament.\n"
 
 #: cmdline/apt-get.cc:639
 #, c-format
@@ -773,7 +806,7 @@ msgstr "El paquet %s és un paquet virtual proveït per:\n"
 
 #: cmdline/apt-get.cc:673
 msgid " [Installed]"
-msgstr " [Instal·lat]"
+msgstr " [Instaŀlat]"
 
 #: cmdline/apt-get.cc:682
 msgid " [Not candidate version]"
@@ -781,7 +814,7 @@ msgstr "[Versió no candidata]"
 
 #: cmdline/apt-get.cc:684
 msgid "You should explicitly select one to install."
-msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
+msgstr "Necessiteu seleccionar-ne un explícitament per a instaŀlar-lo."
 
 #: cmdline/apt-get.cc:687
 #, c-format
@@ -801,44 +834,44 @@ msgstr "Tot i que els següents paquets el reemplacen:"
 #: cmdline/apt-get.cc:717
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "El paquet '%s' no té candidat d'instal·lació"
+msgstr "El paquet «%s» no té candidat d'instaŀlació"
 
 #: cmdline/apt-get.cc:728
 #, 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 poden ser esborrats\n"
 
 #: cmdline/apt-get.cc:759
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Nota: s'està seleccionant '%s' en comptes de '%s'\n"
+msgstr "Nota: s'està seleccionant «%s» en lloc de «%s»\n"
 
 #: cmdline/apt-get.cc:789
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
-"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
+"S'està ometent %s, ja està instaŀlat i l'actualització no està establerta.\n"
 
 #: cmdline/apt-get.cc:793
 #, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
-"S'està ometent '%s', no està instal·lat i només es demana l'actualització.\n"
+"S'està ometent '%s', no està instaŀlat i només es demana l'actualització.\n"
 
 #: cmdline/apt-get.cc:803
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n"
+msgstr "No es possible la reinstaŀlació del paquet %s, no es pot baixar.\n"
 
 #: cmdline/apt-get.cc:808
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ja es troba en la versió més recent.\n"
 
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
 #, c-format
 msgid "%s set to manually installed.\n"
-msgstr "S'ha marcat %s com instal·lat manualment.\n"
+msgstr "S'ha marcat %s com instaŀlat manualment.\n"
 
 #: cmdline/apt-get.cc:853
 #, c-format
@@ -846,100 +879,100 @@ msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Versió seleccionada '%s' (%s) per a '%s'\n"
 
 #: cmdline/apt-get.cc:858
-#, fuzzy, c-format
+#, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Versió seleccionada '%s' (%s) per a '%s'\n"
+msgstr "Versió seleccionada «%s» (%s) per a «%s» degut a «%s»\n"
 
-#: cmdline/apt-get.cc:899
+#: cmdline/apt-get.cc:898
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
-msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n"
+msgstr "El paquet %s no està instaŀlat, així doncs no es suprimirà\n"
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:973
 msgid "Correcting dependencies..."
-msgstr "S'estan corregint les dependències..."
+msgstr "S'estan corregint les dependències…"
 
-#: cmdline/apt-get.cc:980
+#: cmdline/apt-get.cc:976
 msgid " failed."
 msgstr " ha fallat."
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:979
 msgid "Unable to correct dependencies"
 msgstr "No es poden corregir les dependències"
 
-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:982
 msgid "Unable to minimize the upgrade set"
 msgstr "No es pot minimitzar el joc de versions revisades"
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:984
 msgid " Done"
 msgstr " Fet"
 
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:988
 msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho."
+msgstr "Potser voldreu executar «apt-get -f install» per a corregir-ho."
 
-#: cmdline/apt-get.cc:995
+#: cmdline/apt-get.cc:991
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dependències sense satisfer. Proveu-ho emprant -f."
 
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1016
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "AVÍS: No es poden autenticar els següents paquets!"
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1020
 msgid "Authentication warning overridden.\n"
 msgstr "S'ha descartat l'avís d'autenticació.\n"
 
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:1027
 msgid "Install these packages without verification [y/N]? "
-msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
+msgstr "Voleu instaŀlar aquests paquets sense verificar-los [s/N]? "
 
-#: cmdline/apt-get.cc:1033
+#: cmdline/apt-get.cc:1029
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203
+#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
-#: cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:1079
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 "S'ha produït un error intern, s'ha cridat a InstallPackages amb paquets "
 "trencats!"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1088
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 "Els paquets necessiten ser suprimits però s'ha inhabilitat la supressió."
 
-#: cmdline/apt-get.cc:1103
+#: cmdline/apt-get.cc:1099
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1137
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
-"Què estrany... les mides no coincideixen, informeu a apt@packages.debian.org"
+"Què estrany… les mides no coincideixen, informeu a 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:1148
+#: cmdline/apt-get.cc:1144
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Es necessita obtenir %sB/%sB d'arxius.\n"
+msgstr "S'ha d'obtenir %sB/%sB d'arxius.\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:1153
+#: cmdline/apt-get.cc:1149
 #, c-format
 msgid "Need to get %sB of archives.\n"
-msgstr "Es necessita obtenir %sB d'arxius.\n"
+msgstr "S'ha d'obtenir %sB d'arxius.\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:1160
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
@@ -947,31 +980,31 @@ msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1165
+#: cmdline/apt-get.cc:1161
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
 
-#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428
-#: cmdline/apt-get.cc:2431
+#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
+#: cmdline/apt-get.cc:2370
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
 
-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1189
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
-#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229
+#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
 msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
+msgstr "S'ha especificat «Trivial Only» però aquesta operació no és trivial."
 
-#: cmdline/apt-get.cc:1211
+#: cmdline/apt-get.cc:1207
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: cmdline/apt-get.cc:1213
+#: cmdline/apt-get.cc:1209
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -979,31 +1012,31 @@ msgid ""
 " ?] "
 msgstr ""
 "Esteu a punt de fer quelcom potencialment nociu.\n"
-"Per a continuar escriviu la frase «%s»\n"
+"Per continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1238
+#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
 msgid "Abort."
 msgstr "Avortat."
 
-#: cmdline/apt-get.cc:1234
+#: cmdline/apt-get.cc:1230
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
-#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1491
+#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: cmdline/apt-get.cc:1324
+#: cmdline/apt-get.cc:1320
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497
+#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
 msgid "Download complete and in download only mode"
-msgstr "Descàrrega completa i en mode de només descàrrega"
+msgstr "Baixada completa i en mode de només baixada"
 
-#: cmdline/apt-get.cc:1331
+#: cmdline/apt-get.cc:1327
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1011,19 +1044,19 @@ msgstr ""
 "No es poden baixar alguns arxius, proveu a executar apt-get update o "
 "intenteu-ho amb --fix-missing."
 
-#: cmdline/apt-get.cc:1335
+#: cmdline/apt-get.cc:1331
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
 
-#: cmdline/apt-get.cc:1340
+#: cmdline/apt-get.cc:1336
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: cmdline/apt-get.cc:1341
+#: cmdline/apt-get.cc:1337
 msgid "Aborting install."
-msgstr "S'està avortant la instal·lació."
+msgstr "S'està avortant la instaŀlació."
 
-#: cmdline/apt-get.cc:1369
+#: cmdline/apt-get.cc:1365
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1037,37 +1070,37 @@ msgstr[1] ""
 "Els següents paquets han desaparegut del vostre sistema ja\n"
 "que tots els fitxers s'han sobreescrit per altres paquets:"
 
-#: cmdline/apt-get.cc:1373
+#: cmdline/apt-get.cc:1369
 msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr "Nota: Això es realitzarà automàticament a propòsit del dpkg."
+msgstr "Nota: Això ho fa el dpkg automàticament i a propòsit."
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1499
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Ignorar la versió objectiu '%s' no disponible del paquet '%s'"
+msgstr "Ignora la versió objectiu «%s» no disponible del paquet «%s»"
 
-#: cmdline/apt-get.cc:1535
+#: cmdline/apt-get.cc:1531
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "S'està agafant '%s' com a paquet font en comptes de '%s'\n"
+msgstr "S'està agafant «%s» com a paquet font en lloc de '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: cmdline/apt-get.cc:1569
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr "Ignorar la versió '%s' no disponible del paquet '%s'"
+msgstr "Descarta la versió «%s» no disponible del paquet «%s»"
 
-#: cmdline/apt-get.cc:1589
+#: cmdline/apt-get.cc:1585
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
-#: cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:1647
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1699
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1085,226 +1118,221 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855
+#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
-#: cmdline/apt-get.cc:1710
+#: cmdline/apt-get.cc:1706
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
-#: cmdline/apt-get.cc:1717
+#: cmdline/apt-get.cc:1713
 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] ""
-"El paquet següent s'ha instal·lat automàticament i ja no serà necessari:"
+"El paquet següent s'ha instaŀlat automàticament i ja no serà necessari:"
 msgstr[1] ""
-"Els paquets següents s'han instal·lat automàticament i ja no són necessaris:"
+"Els paquets següents s'han instaŀlat automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1721
+#: cmdline/apt-get.cc:1717
 #, 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] ""
-"El paquet %lu es va instal·lar automàticament i ja no és necessari:\n"
+"El paquet %lu es va instaŀlar automàticament i ja no és necessari:\n"
 msgstr[1] ""
-"Els paquets %lu es van s'instal·lar automàticament i ja no són necessaris:\n"
+"Els paquets %lu es van s'instaŀlar automàticament i ja no són necessaris:\n"
 
-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1719
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: cmdline/apt-get.cc:1742
+#: cmdline/apt-get.cc:1738
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
-#: cmdline/apt-get.cc:1825
+#: cmdline/apt-get.cc:1828
 msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Potser voldreu executar 'apt-get -f install' per a corregir-ho:"
+msgstr "Potser voldreu executar «apt-get -f install» per corregir-ho:"
 
-#: cmdline/apt-get.cc:1828
+#: cmdline/apt-get.cc:1831
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
-"Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
+"Dependències insatisfetes. Proveu amb «apt-get -f install» sense paquets (o "
 "especifiqueu una solució)."
 
-#: cmdline/apt-get.cc:1840
+#: cmdline/apt-get.cc:1843
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 msgstr ""
-"No s'han pogut instal·lar alguns paquets. Això pot ser degut a que vàreu\n"
-"requerir una situació imposible o a que esteu emprant la distribució\n"
-"unstable i alguns paquets requerits encara no han estat creats o bé\n"
-"encara no els hi han afegit."
+"No s'han pogut instaŀlar alguns paquets. Això pot ser degut a que heu\n"
+"demanat una situació impossible o que esteu emprant la distribució\n"
+"«unstable» i alguns paquets requerits encara no han estat creats o bé\n"
+"encara no els hi han introduït des d'«Incoming»."
 
-#: cmdline/apt-get.cc:1858
+#: cmdline/apt-get.cc:1861
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:1886
+#: cmdline/apt-get.cc:1889
 msgid "The following extra packages will be installed:"
-msgstr "S'instal·laran els següents paquets extres:"
+msgstr "S'instaŀlaran els següents paquets extres:"
 
-#: cmdline/apt-get.cc:1976
+#: cmdline/apt-get.cc:1979
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:1977
+#: cmdline/apt-get.cc:1980
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:2022
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:2029
 #, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "S'ha marcat %s com instal·lat automàticament.\n"
+msgstr "S'ha marcat %s com instaŀlat automàticament.\n"
 
-#: cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:2050
 msgid "Calculating upgrade... "
-msgstr "S'està calculant l'actualització... "
+msgstr "S'està calculant l'actualització… "
 
-#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:2055
+#: cmdline/apt-get.cc:2058
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
 
-#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187
+#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
-#: cmdline/apt-get.cc:2238
-#, c-format
-msgid "Downloading %s %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2233
 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 
-#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615
+#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
 
-#: cmdline/apt-get.cc:2350
+#: cmdline/apt-get.cc:2289
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
-"Avís: L'empaquetat '%s' és mantingut pel sistema de control de versions '%s' "
-"a:\n"
+"Avís: L'empaquetat de «%s» és mantingut amb el sistema de control de\n"
+"versions «%s» a:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2294
 #, c-format
 msgid ""
 "Please use:\n"
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
-"Utilitzeu:\n"
+"Empreu:\n"
 "bzr get %s\n"
-"per a recuperar les últimes actualitzacions (possiblement inèdites) del "
+"per a obtenir les últimes actualitzacions (possiblement no publicades) del "
 "paquet.\n"
 
-#: cmdline/apt-get.cc:2406
+#: cmdline/apt-get.cc:2345
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:2441
+#: cmdline/apt-get.cc:2380
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2449
+#: cmdline/apt-get.cc:2388
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2454
+#: cmdline/apt-get.cc:2393
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2460
+#: cmdline/apt-get.cc:2399
 #, c-format
 msgid "Fetch source %s\n"
-msgstr "Obté el font %s\n"
+msgstr "Obtén el font %s\n"
 
-#: cmdline/apt-get.cc:2493
+#: cmdline/apt-get.cc:2432
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:2523
+#: cmdline/apt-get.cc:2462
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
 
-#: cmdline/apt-get.cc:2535
+#: cmdline/apt-get.cc:2474
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2536
+#: cmdline/apt-get.cc:2475
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
+msgstr "Comproveu si el paquet «dpkgdev» està instaŀlat.\n"
 
-#: cmdline/apt-get.cc:2553
+#: cmdline/apt-get.cc:2492
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2573
+#: cmdline/apt-get.cc:2512
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:2589
+#: cmdline/apt-get.cc:2528
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "S'ha d'especificar un paquet per a verificar les dependències de construcció "
 "per a"
 
-#: cmdline/apt-get.cc:2620
+#: cmdline/apt-get.cc:2559
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "No es pot obtenir informació sobre les dependències de construcció per a %s"
 
-#: cmdline/apt-get.cc:2640
+#: cmdline/apt-get.cc:2579
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:2691
+#: cmdline/apt-get.cc:2630
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1313,7 +1341,7 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
-#: cmdline/apt-get.cc:2744
+#: cmdline/apt-get.cc:2683
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1322,38 +1350,76 @@ msgstr ""
 "La dependència %s per a %s no es pot satisfer per que cap versió del paquet "
 "%s pot satisfer els requeriments de versions"
 
-#: cmdline/apt-get.cc:2780
+#: cmdline/apt-get.cc:2719
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
-"és massa nou"
+"No s'ha pogut satisfer la dependència %s per a %s: El paquet instaŀlat %s és "
+"massa nou"
 
-#: cmdline/apt-get.cc:2807
+#: cmdline/apt-get.cc:2746
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
 
-#: cmdline/apt-get.cc:2823
+#: cmdline/apt-get.cc:2762
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
 
-#: cmdline/apt-get.cc:2828
+#: cmdline/apt-get.cc:2767
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933
-#, fuzzy, c-format
-msgid "Changelog for %s (%s)"
-msgstr "S'està connectant amb %s (%s)"
-
-#: cmdline/apt-get.cc:3052
+#: cmdline/apt-get.cc:2798
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:3093
+#: cmdline/apt-get.cc:2839
 #, fuzzy
+#| msgid ""
+#| "Usage: apt-get [options] command\n"
+#| "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+#| "       apt-get [options] source pkg1 [pkg2 ...]\n"
+#| "\n"
+#| "apt-get is a simple command line interface for downloading and\n"
+#| "installing packages. The most frequently used commands are update\n"
+#| "and install.\n"
+#| "\n"
+#| "Commands:\n"
+#| "   update - Retrieve new lists of packages\n"
+#| "   upgrade - Perform an upgrade\n"
+#| "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+#| "   remove - Remove packages\n"
+#| "   autoremove - Remove automatically all unused packages\n"
+#| "   purge - Remove packages and config files\n"
+#| "   source - Download source archives\n"
+#| "   build-dep - Configure build-dependencies for source packages\n"
+#| "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+#| "   dselect-upgrade - Follow dselect selections\n"
+#| "   clean - Erase downloaded archive files\n"
+#| "   autoclean - Erase old downloaded archive files\n"
+#| "   check - Verify that there are no broken dependencies\n"
+#| "   changelog - Download and display the changelog for the given package\n"
+#| "   download - Download the binary package into the current directory\n"
+#| "\n"
+#| "Options:\n"
+#| "  -h  This help text.\n"
+#| "  -q  Loggable output - no progress indicator\n"
+#| "  -qq No output except for errors\n"
+#| "  -d  Download only - do NOT install or unpack archives\n"
+#| "  -s  No-act. Perform ordering simulation\n"
+#| "  -y  Assume Yes to all queries and do not prompt\n"
+#| "  -f  Attempt to 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"
+#| "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+#| "pages for more information and options.\n"
+#| "                       This APT has Super Cow Powers.\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1379,8 +1445,6 @@ msgid ""
 "   check - Verify that there are no broken dependencies\n"
 "   markauto - Mark the given packages as automatically installed\n"
 "   unmarkauto - Mark the given packages as manually installed\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1401,17 +1465,17 @@ msgid ""
 "                       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"
+"             apt-get [opcions] install|remove paq1 [paq2 …]\n"
+"             apt-get [opcions] source paq1 [paq2 …]\n"
 "\n"
-"apt-get és una simple interfície de línia d'ordres per a\n"
-"baixar i instal·lar paquets. Les ordres més freqüents\n"
-"són update i install.\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é llistes noves dels paquets\n"
+"   update - Obtén llistes noves dels paquets\n"
 "   upgrade - Realitza una actualització\n"
-"   install - Instal·la nous paquets (el paquet és libc6 no libc6.deb)\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"
@@ -1419,32 +1483,32 @@ msgstr ""
 "   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 - Esborra els fitxers d'arxiu baixats\n"
-"   autoclean - Esborra els fitxers d'arxiu antics baixats\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 instal·lats automàticament\n"
-"   unmarkauto - Marca els paquets donats com a instal·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"
+"  -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 instal·les o desempaquetes arxius\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 que Sí per a totes les preguntes, sense interrupcions\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 treben els arxius\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=? Estableix una opció de configuració arbitrària, p. ex.\n"
 "       -o dir::cache=/tmp\n"
-"Vegeu els manuals apt-get(8), sources.list(5) i apt.conf(5)\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"
+"                       Aquest APT té superpoders bovins.\n"
 
-#: cmdline/apt-get.cc:3254
+#: cmdline/apt-get.cc:2995
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1475,7 +1539,7 @@ msgstr "Err "
 #: cmdline/acqprogress.cc:137
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "%sB baixats en %s (%sB/s)\n"
+msgstr "S'ha baixat %sB en %s (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:227
 #, c-format
@@ -1510,20 +1574,20 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
-"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 ...]\n"
+"Forma d'ús: apt-sortpkgs [opcions] fitxer1 [fitxer2 …]\n"
 "\n"
-"apt-sortpkgs és una simple eina per a ordenar fitxers de paquets.\n"
+"apt-sortpkgs és una eina simple per ordenar fitxers de paquets.\n"
 "L'opció -s s'usa per a indicar quin tipus de fitxer és.\n"
 "\n"
 "Opcions:\n"
 "  -h   Aquest text d'ajuda.\n"
 "  -s   Empra l'ordenació de fitxers font\n"
 "  -c=? Llegeix aquest fitxer de configuració\n"
-"  -o=? Estableix una opció de configuració, p.ex: -o dir::cache=/tmp\n"
+"  -o=? Estableix una opció de configuració, p. ex: -o dir::cache=/tmp\n"
 
 #: dselect/install:32
 msgid "Bad default setting!"
-msgstr "Paràmetre establert incorrecte!"
+msgstr "Paràmetre per defecte incorrecte!"
 
 #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
 #: dselect/install:105 dselect/update:45
@@ -1537,8 +1601,7 @@ msgstr "Voleu suprimir els paquets .deb baixats prèviament?"
 #: dselect/install:101
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr ""
-"S'han produït alguns errors en desempaquetar. Els paquets que s'han "
-"instal·lat"
+"S'han produït alguns errors en desempaquetar. Els paquets que s'han instaŀlat"
 
 #: dselect/install:102
 msgid "will be configured. This may result in duplicate errors"
@@ -1554,8 +1617,8 @@ msgstr ""
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
-"anteriors a aquest missatge són importants. Arregleu-los i torneu a executar "
-"[I]nstal·la una altra vegada"
+"anteriors a aquest missatge són importants. Corregiu-los i torneu a executar "
+"[I]nstaŀla una altra vegada"
 
 #: dselect/update:30
 msgid "Merging available information"
@@ -1569,7 +1632,7 @@ msgstr "No es poden crear els conductes"
 msgid "Failed to exec gzip "
 msgstr "No es pot executar el gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
 msgid "Corrupted archive"
 msgstr "Arxiu corromput"
 
@@ -1577,7 +1640,7 @@ msgstr "Arxiu corromput"
 msgid "Tar checksum failed, archive corrupted"
 msgstr "La suma de comprovació de tar ha fallat, arxiu corromput"
 
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:296
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Capçalera TAR desconeguda del tipus %u, membre %s"
@@ -1685,28 +1748,28 @@ msgstr "No s'ha trobat el node dins de la taula"
 msgid "The path is too long"
 msgstr "La ruta és massa llarga"
 
-#: apt-inst/extract.cc:412
+#: apt-inst/extract.cc:414
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "S'està sobreescrivint el corresponent paquet sense versió per a %s"
 
-#: apt-inst/extract.cc:429
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:334 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
 #: methods/mirror.cc:87
 #, c-format
 msgid "Unable to read %s"
 msgstr "No es pot llegir %s"
 
-#: apt-inst/extract.cc:489
+#: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 msgstr "No es pot veure l'estat de %s"
@@ -1732,9 +1795,9 @@ msgstr ""
 "La info i els directoris temp necessiten estar en el mateix sistema de "
 "fitxers"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1074
-#: apt-pkg/pkgcachegen.cc:1178 apt-pkg/pkgcachegen.cc:1184
-#: apt-pkg/pkgcachegen.cc:1330
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326
 msgid "Reading package lists"
 msgstr "S'està llegint la llista de paquets"
 
@@ -1760,7 +1823,7 @@ msgid ""
 "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 instal·lar immediatament la mateixa "
+"aquest fitxer, creeu-lo buit i torneu a instaŀlar immediatament la mateixa "
 "versió del paquet!"
 
 #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
@@ -1837,28 +1900,24 @@ msgstr "No s'ha trobat un fitxer de control vàlid"
 msgid "Unparsable control file"
 msgstr "El fitxer de control no es pot analitzar"
 
-#: methods/bzip2.cc:60 methods/gzip.cc:52
-msgid "Empty files can't be valid archives"
-msgstr ""
-
-#: methods/bzip2.cc:64
+#: methods/bzip2.cc:65
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "No s'ha pogut obrir un conducte per a %s"
 
-#: methods/bzip2.cc:108
+#: methods/bzip2.cc:109
 #, c-format
 msgid "Read error from %s process"
 msgstr "S'ha produït un error en llegir des del procés %s"
 
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
+#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
+#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
+#: methods/rred.cc:495
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
+#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
+#: methods/rred.cc:492
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
@@ -1935,7 +1994,7 @@ msgstr ""
 #: methods/ftp.cc:271
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr "L'ordre '%s' de l'script d'accés ha fallat, el servidor ha dit: %s"
+msgstr "L'ordre «%s» de l'script d'accés ha fallat, el servidor ha dit: %s"
 
 #: methods/ftp.cc:297
 #, c-format
@@ -1950,19 +2009,19 @@ msgstr "Temps de connexió finalitzat"
 msgid "Server closed the connection"
 msgstr "El servidor ha tancat la connexió"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:811 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Error de lectura"
 
 #: methods/ftp.cc:351 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
-msgstr "Una resposta ha desbordat la memòria temporal."
+msgstr "Una resposta ha desbordat la memòria intermèdia."
 
 #: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
 msgstr "Protocol corromput"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:853 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Error d'escriptura"
 
@@ -1985,7 +2044,7 @@ msgstr "gettaddrinfo no es pot obtenir un sòcol que escolte"
 # abastar? huh? jm
 #: methods/ftp.cc:741
 msgid "Could not bind a socket"
-msgstr "No s'ha pogut abastar un connector"
+msgstr "No s'ha pogut vincular a un connector"
 
 #: methods/ftp.cc:745
 msgid "Could not listen on the socket"
@@ -2024,7 +2083,7 @@ msgstr "Problema escollint el fitxer"
 #: methods/ftp.cc:882
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
-msgstr "No és possible reprendre el fitxer, el servidor ha dit '%s'"
+msgstr "No és possible obtenir el fitxer, el servidor ha dit '%s'"
 
 #: methods/ftp.cc:897 methods/rsh.cc:321
 msgid "Data socket timed out"
@@ -2105,7 +2164,7 @@ msgstr "No es pot connectar amb %s:%s:"
 #: methods/gpgv.cc:71
 #, c-format
 msgid "No keyring installed in %s."
-msgstr "No s'ha instal·lat cap clauer a %s."
+msgstr "No s'ha instaŀlat cap clauer a %s."
 
 #: methods/gpgv.cc:163
 msgid ""
@@ -2121,8 +2180,8 @@ msgstr "S'ha trobat almenys una signatura invàlida."
 #: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"No s'ha pogut executar 'gpgv' per a verificar la firma (està instal·lat el "
-"gpgv?)"
+"No s'ha pogut executar «gpgv» per a verificar la signatura (està instaŀlat "
+"el gpgv?)"
 
 #: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
@@ -2202,7 +2261,7 @@ msgstr ""
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
 msgstr "No s'ha pogut truncar el fitxer %s"
 
@@ -2240,7 +2299,7 @@ msgstr "No es pot tancar el mmap"
 msgid "Unable to synchronize mmap"
 msgstr "No es pot sincronitzar el mmap"
 
-#: apt-pkg/contrib/mmap.cc:302
+#: apt-pkg/contrib/mmap.cc:300
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2249,7 +2308,7 @@ msgstr ""
 "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-"
 "Limit. Valor actual: %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:401
+#: apt-pkg/contrib/mmap.cc:399
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2258,7 +2317,7 @@ msgstr ""
 "No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja "
 "s'ha superat."
 
-#: apt-pkg/contrib/mmap.cc:404
+#: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2289,7 +2348,7 @@ msgstr "%limin %lis"
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1136
+#: apt-pkg/contrib/strutl.cc:1119
 #, c-format
 msgid "Selection %s not found"
 msgstr "No s'ha trobat la selecció %s"
@@ -2354,12 +2413,12 @@ msgstr "Error sintàctic %s:%u: Text extra al final del fitxer"
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
 msgid "%c%s... Error!"
-msgstr "%c%s... Error!"
+msgstr "%c%s… Error!"
 
 #: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Done"
-msgstr "%c%s... Fet"
+msgstr "%c%s… Fet"
 
 #: apt-pkg/contrib/cmndline.cc:77
 #, c-format
@@ -2423,114 +2482,98 @@ msgstr "No es pot canviar a %s"
 msgid "Failed to stat the cdrom"
 msgstr "No s'ha pogut fer «stat» del cdrom"
 
-#: apt-pkg/contrib/fileutl.cc:159
+#: apt-pkg/contrib/fileutl.cc:154
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s"
 
-#: apt-pkg/contrib/fileutl.cc:164
+#: apt-pkg/contrib/fileutl.cc:159
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "No es pot resoldre el fitxer de blocat %s"
 
-#: apt-pkg/contrib/fileutl.cc:182
+#: apt-pkg/contrib/fileutl.cc:177
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs"
 
-#: apt-pkg/contrib/fileutl.cc:186
+#: apt-pkg/contrib/fileutl.cc:181
 #, c-format
 msgid "Could not get lock %s"
 msgstr "No s'ha pogut blocar %s"
 
-#: apt-pkg/contrib/fileutl.cc:326
+#: apt-pkg/contrib/fileutl.cc:321
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:353
-#, c-format
-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:371
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:380
-#, c-format
-msgid ""
-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
-msgstr ""
+msgstr "No es pot crear la llista de fitxers perquè «%s» no és un directori"
 
-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:661
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Esperava %s però no hi era"
 
-#: apt-pkg/contrib/fileutl.cc:682
+#: apt-pkg/contrib/fileutl.cc:673
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
-msgstr "Sub-procés %s ha rebut una violació de segment."
+msgstr "El sub-procés %s ha rebut una violació de segment."
 
-#: apt-pkg/contrib/fileutl.cc:684
+#: apt-pkg/contrib/fileutl.cc:675
 #, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Sub-procés %s ha rebut una senyal %u."
+msgstr "El sub-procés %s ha rebut un senyal %u."
 
-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:679
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
-msgstr "Sub-procés %s ha retornat un codi d'error (%u)"
+msgstr "El sub-procés %s ha retornat un codi d'error (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:690
+#: apt-pkg/contrib/fileutl.cc:681
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "El sub-procés %s ha sortit inesperadament"
 
-#: apt-pkg/contrib/fileutl.cc:755
+#: apt-pkg/contrib/fileutl.cc:746
 #, c-format
 msgid "Could not open file %s"
 msgstr "No s'ha pogut obrir el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:772
+#: apt-pkg/contrib/fileutl.cc:763
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
 
-#: apt-pkg/contrib/fileutl.cc:832
+#: apt-pkg/contrib/fileutl.cc:823
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "llegits, falten %lu per llegir, però no queda res"
 
-#: apt-pkg/contrib/fileutl.cc:865
+#: apt-pkg/contrib/fileutl.cc:856
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "escrits, falten %lu per escriure però no s'ha pogut"
 
-#: apt-pkg/contrib/fileutl.cc:1001
+#: apt-pkg/contrib/fileutl.cc:985
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
 
-#: apt-pkg/contrib/fileutl.cc:1004
+#: apt-pkg/contrib/fileutl.cc:988
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Ha hagut un problema en tancar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1009
+#: apt-pkg/contrib/fileutl.cc:993
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
 
-#: apt-pkg/contrib/fileutl.cc:1020
+#: apt-pkg/contrib/fileutl.cc:1004
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
 
-#: apt-pkg/contrib/fileutl.cc:1033
+#: apt-pkg/contrib/fileutl.cc:1017
 msgid "Problem syncing the file"
 msgstr "Ha hagut un problema en sincronitzar el fitxer"
 
@@ -2642,7 +2685,7 @@ msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
 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 "
-"instal·lable"
+"instaŀlable"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2743,7 +2786,7 @@ msgid ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
-"Aquesta instal·lació requereix suprimir temporalment el paquet essencial %s "
+"Aquesta instaŀlació requereix suprimir temporalment el paquet essencial %s "
 "per qüestió d'un bucle de Conflictes/Pre-dependències. Això sol ser una cosa "
 "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
 "LoopBreak."
@@ -2762,14 +2805,14 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "El tipus de fitxer índex «%s» no està suportat"
 
-#: apt-pkg/algorithms.cc:313
+#: apt-pkg/algorithms.cc:292
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
-"El paquet %s necessita ser reinstal·lat, però no se li pot trobar un arxiu."
+"El paquet %s necessita ser reinstaŀlat, però no se li pot trobar un arxiu."
 
-#: apt-pkg/algorithms.cc:1239
+#: apt-pkg/algorithms.cc:1218
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2777,20 +2820,23 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve ha generat pauses, això pot haver estat "
 "causat per paquets retinguts."
 
-#: apt-pkg/algorithms.cc:1241
+#: apt-pkg/algorithms.cc:1220
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "No es poden corregir els problemes, teniu paquets retinguts que estan "
 "trencats."
 
-#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
+#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
 #, fuzzy
+#| msgid ""
+#| "Some index files failed to download. They have been ignored, or old ones "
+#| "used instead."
 msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
+"Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"No es poden baixar alguns fitxers índex, s'han ignorat o en el seu lloc "
-"s'han emprat els antics."
+"Alguns índex no s'han pogut baixar. S'han descartat, o en el seu lloc s'han "
+"emprat els antics."
 
 #: apt-pkg/acquire.cc:79
 #, c-format
@@ -2834,12 +2880,12 @@ msgstr "El mètode %s no s'ha iniciat correctament"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inseriu el disc amb l'etiqueta: «%s» en la unitat «%s» i premeu Intro."
 
-#: apt-pkg/init.cc:146
+#: apt-pkg/init.cc:143
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "El sistema d'empaquetament «%s» no està suportat"
 
-#: apt-pkg/init.cc:162
+#: apt-pkg/init.cc:159
 msgid "Unable to determine a suitable packaging system type"
 msgstr "No es pot determinar un tipus de sistema d'empaquetament adequat."
 
@@ -2866,17 +2912,17 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
 
-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:344
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera"
 
-#: apt-pkg/policy.cc:368
+#: apt-pkg/policy.cc:366
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "No s'ha entès el pin de tipus %s"
 
-#: apt-pkg/policy.cc:376
+#: apt-pkg/policy.cc:374
 msgid "No priority (or zero) specified for pin"
 msgstr "No hi ha prioritat especificada per al pin (o és zero)"
 
@@ -2964,16 +3010,16 @@ msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 "No s'ha trobat el paquet %s %s en processar les dependències del fitxer"
 
-#: apt-pkg/pkgcachegen.cc:986
+#: apt-pkg/pkgcachegen.cc:982
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "No s'ha pogut llegir la llista de paquets font %s"
 
-#: apt-pkg/pkgcachegen.cc:1091
+#: apt-pkg/pkgcachegen.cc:1087
 msgid "Collecting File Provides"
 msgstr "S'estan recollint els fitxers que proveeixen"
 
-#: apt-pkg/pkgcachegen.cc:1269 apt-pkg/pkgcachegen.cc:1276
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
 msgstr "Error d'E/S en desar la memòria cau de la font"
 
@@ -2982,60 +3028,48 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:629
+#: apt-pkg/acquire-item.cc:484
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 no concorda"
 
-#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781
-#: apt-pkg/acquire-item.cc:1924
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
+#: apt-pkg/acquire-item.cc:1717
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:1341
-#, c-format
-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1356
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "No es pot analitzar el fitxer Release %s"
-
-#: apt-pkg/acquire-item.cc:1415
+#: apt-pkg/acquire-item.cc:1244
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formated in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1452
+#: apt-pkg/acquire-item.cc:1281
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
 msgstr "El fitxer Release ha caducat, s'està ignorant %s (invàlid des de %s)"
 
-#: apt-pkg/acquire-item.cc:1473
+#: apt-pkg/acquire-item.cc:1302
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)"
 
-#: apt-pkg/acquire-item.cc:1506
+#: apt-pkg/acquire-item.cc:1328
 #, c-format
 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 ""
-"S'ha produït un error durant la verificació de la firma. El repositori no "
-"està actualitzat i serà utilitzat el fitxer d'índex anterior. error GPG: %s: "
+"S'ha produït un error durant la verificació de la signatura. El dipòsit no "
+"està actualitzat i s'emprarà el fitxer d'índex anterior. Error del GPG: %s: "
 "%s\n"
 
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1337
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "S'ha produït un error amb el GPG: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1572
+#: apt-pkg/acquire-item.cc:1365
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3045,7 +3079,7 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1631
+#: apt-pkg/acquire-item.cc:1424
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3054,7 +3088,7 @@ msgstr ""
 "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
 "d'arreglar aquest paquet manualment."
 
-#: apt-pkg/acquire-item.cc:1686
+#: apt-pkg/acquire-item.cc:1479
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3062,7 +3096,7 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/acquire-item.cc:1773
+#: apt-pkg/acquire-item.cc:1566
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
@@ -3071,22 +3105,22 @@ msgstr "La mida no concorda"
 msgid "Unable to parse Release file %s"
 msgstr "No es pot analitzar el fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:63
+#: apt-pkg/indexrecords.cc:60
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "No hi ha seccions al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:97
+#: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "No hi ha una entrada Hash al fitxer Release %s"
 
-#: apt-pkg/indexrecords.cc:110
+#: apt-pkg/indexrecords.cc:107
 #, 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"
 
-#: apt-pkg/indexrecords.cc:125
+#: apt-pkg/indexrecords.cc:122
 #, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "No hi ha una entrada 'date' al fitxer Release %s"
@@ -3107,7 +3141,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
 msgid "Identifying.. "
-msgstr "S'està identificant..."
+msgstr "S'està identificant…"
 
 #: apt-pkg/cdrom.cc:552
 #, c-format
@@ -3116,7 +3150,7 @@ msgstr "S'ha emmagatzemat l'etiqueta: %s\n"
 
 #: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
 msgid "Unmounting CD-ROM...\n"
-msgstr "S'esta desmuntant el CD-ROM...\n"
+msgstr "S'esta desmuntant el CD-ROM…\n"
 
 #: apt-pkg/cdrom.cc:578
 #, c-format
@@ -3129,16 +3163,16 @@ msgstr "S'està desmuntant el CD-ROM\n"
 
 #: apt-pkg/cdrom.cc:600
 msgid "Waiting for disc...\n"
-msgstr "S'està esperant al disc...\n"
+msgstr "S'està esperant al disc…\n"
 
 #. Mount the new CDROM
 #: apt-pkg/cdrom.cc:608
 msgid "Mounting CD-ROM...\n"
-msgstr "S'està muntant el CD-ROM...\n"
+msgstr "S'està muntant el CD-ROM…\n"
 
 #: apt-pkg/cdrom.cc:626
 msgid "Scanning disc for index files..\n"
-msgstr "S'està analitzant el disc per a fitxers d'índex...\n"
+msgstr "S'està analitzant el disc per a fitxers d'índex…\n"
 
 #: apt-pkg/cdrom.cc:666
 #, c-format
@@ -3177,7 +3211,7 @@ msgstr ""
 
 #: apt-pkg/cdrom.cc:752
 msgid "Copying package lists..."
-msgstr "S'estan copiant les llistes de paquets..."
+msgstr "S'estan copiant les llistes de paquets…"
 
 #: apt-pkg/cdrom.cc:778
 msgid "Writing new source list\n"
@@ -3187,22 +3221,22 @@ msgstr "S'està escrivint una nova llista de fonts\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Les entrades de la llista de fonts per a aquest disc són:\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "S'han escrit %i registres.\n"
 
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "S'han escrit %i registres, on falten %i fitxers.\n"
 
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "S'han escrit %i registres, on hi ha %i fitxers no coincidents\n"
 
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
@@ -3237,18 +3271,18 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»"
 #: apt-pkg/cacheset.cc:447
 #, c-format
 msgid "Couldn't find task '%s'"
-msgstr "No s'ha pogut trobar la tasca '%s'"
+msgstr "No s'ha pogut trobar la tasca «%s»"
 
 #: apt-pkg/cacheset.cc:454
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular '%s'"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular «%s»"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
-"No s'han pogut seleccionar les versions del paquet '%s' ja que és purament "
+"No s'han pogut seleccionar les versions del paquet «%s» ja que és purament "
 "virtual"
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
@@ -3257,14 +3291,14 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
-"No s'han pogut seleccionar la versió instal·lada ni la candidata del paquet "
-"'%s' ja que no estan disponibles cap de les dues"
+"No s'han pogut seleccionar la versió instaŀlada ni la candidata del paquet "
+"«%s» ja que no estan disponibles cap de les dues"
 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
-"No s'ha pogut seleccionar la versió més nova del paquet '%s' ja que és "
+"No s'ha pogut seleccionar la versió més nova del paquet «%s» ja que és "
 "purament virtual"
 
 #: apt-pkg/cacheset.cc:499
@@ -3278,20 +3312,20 @@ msgstr ""
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
-"No s'ha pogut seleccionar la versió instal·lada del paquet %s ja que no està "
-"instal·lada"
+"No s'ha pogut seleccionar la versió instaŀlada del paquet %s ja que no està "
+"instaŀlada"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Installing %s"
-msgstr "S'està instal·lant %s"
+msgstr "S'està instaŀlant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
 #, c-format
 msgid "Configuring %s"
 msgstr "S'està configurant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
 #, c-format
 msgid "Removing %s"
 msgstr "S'està suprimint el paquet %s"
@@ -3309,79 +3343,79 @@ msgstr "Anotant la desaparició de %s"
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
 msgid "Running post-installation trigger %s"
-msgstr "S'està executant l'activador de postinstal·lació %s"
+msgstr "S'està executant l'activador de postinstaŀlació %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:646
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Manca el directori «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671
+#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
 #, c-format
 msgid "Could not open file '%s'"
-msgstr "No s'ha pogut obrir el fitxer '%s'"
+msgstr "No s'ha pogut obrir el fitxer «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:812
+#: apt-pkg/deb/dpkgpm.cc:816
 #, c-format
 msgid "Preparing %s"
 msgstr "S'està preparant el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:813
+#: apt-pkg/deb/dpkgpm.cc:817
 #, c-format
 msgid "Unpacking %s"
 msgstr "S'està desempaquetant %s"
 
-#: apt-pkg/deb/dpkgpm.cc:818
+#: apt-pkg/deb/dpkgpm.cc:822
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "S'està preparant per a configurar el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:824
 #, c-format
 msgid "Installed %s"
-msgstr "S'ha instal·lat el paquet %s"
+msgstr "S'ha instaŀlat el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:825
+#: apt-pkg/deb/dpkgpm.cc:829
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "S'està preparant per a la supressió del paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/deb/dpkgpm.cc:831
 #, c-format
 msgid "Removed %s"
 msgstr "S'ha suprimit el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:832
+#: apt-pkg/deb/dpkgpm.cc:836
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "S'està preparant per a suprimir completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:833
+#: apt-pkg/deb/dpkgpm.cc:837
 #, c-format
 msgid "Completely removed %s"
 msgstr "S'ha suprimit completament el paquet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1039
+#: apt-pkg/deb/dpkgpm.cc:1043
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "No es pot escriure el registre, ha fallat openpty() (no s'ha muntat /dev/"
 "pts?)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1074
 msgid "Running dpkg"
 msgstr "S'està executant dpkg"
 
-#: apt-pkg/deb/dpkgpm.cc:1273
+#: apt-pkg/deb/dpkgpm.cc:1277
 msgid "No apport report written because MaxReports is reached already"
 msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1278
+#: apt-pkg/deb/dpkgpm.cc:1282
 msgid "dependency problems - leaving unconfigured"
 msgstr "S'han produït problemes de depències, es deixa sense configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1280
+#: apt-pkg/deb/dpkgpm.cc:1284
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3389,7 +3423,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
 "consequent de una fallida anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1286
+#: apt-pkg/deb/dpkgpm.cc:1290
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3397,7 +3431,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "disc ple"
 
-#: apt-pkg/deb/dpkgpm.cc:1292
+#: apt-pkg/deb/dpkgpm.cc:1296
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3405,7 +3439,7 @@ msgstr ""
 "No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
 "falta de memòria"
 
-#: apt-pkg/deb/dpkgpm.cc:1299
+#: apt-pkg/deb/dpkgpm.cc:1303
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3433,7 +3467,7 @@ 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 "
+"S'ha interromput el dpkg, harieu d'executar manualment «%s» per a corregir "
 "el problema."
 
 #: apt-pkg/deb/debsystem.cc:106
@@ -3445,14 +3479,14 @@ msgstr "No blocat"
 #: methods/mirror.cc:200
 #, 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»"
 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"
 msgstr "[Rèplica: %s]"
 
-#: methods/rred.cc:503
+#: methods/rred.cc:465
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
@@ -3461,7 +3495,7 @@ msgstr ""
 "No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació "
 "del fitxer - el pedaç sembla ser incorrecte"
 
-#: methods/rred.cc:508
+#: methods/rred.cc:470
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
@@ -3474,6 +3508,121 @@ msgstr ""
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+#~ msgstr ""
+#~ "Aquesta ordre és desfasada. Empreu «apt-mark showauto» en el seu lloc."
+
+#~ 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."
+
+#~ msgid "Downloading %s %s"
+#~ msgstr "S'està baixant %s %s"
+
+#~ msgid "Changelog for %s (%s)"
+#~ msgstr "Registre de canvis per a %s (%s)"
+
+#~ msgid "%s can not be marked as it is not installed.\n"
+#~ msgstr "%s no es pot marcar perquè no està instaŀlat.\n"
+
+#~ msgid "%s was already set to manually installed.\n"
+#~ msgstr "%s ja estava marcat com instaŀlat manualment.\n"
+
+#~ msgid "%s was already set to automatically installed.\n"
+#~ msgstr "%s ja estava marcat com instaŀlat automàticament.\n"
+
+#~ msgid "%s was already set on hold.\n"
+#~ msgstr "%s ja estava mantingut.\n"
+
+#~ msgid "%s was already not hold.\n"
+#~ msgstr "%s ja estava sense marcar com a mantingut.\n"
+
+#~ msgid "%s set on hold.\n"
+#~ msgstr "S'ha establert %s com a mantingut.\n"
+
+#~ msgid "Canceled hold on %s.\n"
+#~ msgstr "S'ha canceŀlat la marca com a mantingut de %s.\n"
+
+#~ msgid "Executing dpkg failed. Are you root?"
+#~ msgstr "Ha fallat l'execució del dpkg. Sou el superusuari?"
+
+#~ 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 ""
+#~ "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ó."
+
+#~ msgid "Empty files can't be valid archives"
+#~ msgstr "Els fitxers buits no poden ser arxius vàlids"
+
+#~ msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+#~ msgstr ""
+#~ "S'està descartant «%s» al directori «%s» perquè no és un fitxer normal"
+
+#~ msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+#~ msgstr ""
+#~ "S'està descartant «%s» al directori «%s» perquè no té extensió del nom de "
+#~ "fitxer"
+
+#~ msgid ""
+#~ "Ignoring file '%s' in directory '%s' as it has an invalid filename "
+#~ "extension"
+#~ msgstr ""
+#~ "S'està descartant «%s» al directori «%s» perquè té una extensió del nom "
+#~ "de fitxer invàlida"
+
+#~ msgid ""
+#~ "Unable to find expected entry '%s' in Release file (Wrong sources.list "
+#~ "entry or malformed file)"
+#~ msgstr ""
+#~ "No s'ha trobat l'entrada «%s» esperada, al fitxer Release (entrada "
+#~ "errònia al sources.list o fitxer malformat)"
+
+#~ msgid "Unable to find hash sum for '%s' in Release file"
+#~ msgstr "No s'ha trobat la suma de comprovació per a «%s» al fitxer Release"
+
+#~ msgid "Can not read mirror file '%s'"
+#~ msgstr "No s'ha pogut llegir el fitxer rèplica «%s»"
+
 #~ 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à "
@@ -3513,7 +3662,7 @@ msgstr "La connexió s'ha tancat prematurament"
 #~ "that package should be filed."
 #~ msgstr ""
 #~ "Degut a que només heu requerit una única operació, serà molt\n"
-#~ "probable que el paquet no sigui instal·lable i que s'hagi d'emetre\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"
diff --git a/test/integration/framework b/test/integration/framework
index cc5af798c..96cdb5f5e 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -708,3 +708,9 @@ testmarkedauto() {
 	fi
 	aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }
+
+pause() {
+	echo "STOPPED execution. Press enter to continue"
+	local IGNORE
+	read IGNORE
+}
diff --git a/test/integration/test-bug-611729-mark-as-manual b/test/integration/test-bug-611729-mark-as-manual
index 4e3e2fa0b..9cf01610c 100755
--- a/test/integration/test-bug-611729-mark-as-manual
+++ b/test/integration/test-bug-611729-mark-as-manual
@@ -48,11 +48,17 @@ b is already the newest version.
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget install b -d
 testmarkedauto 'b'
 
+rm rootdir/var/log/apt/history.log
+
 aptget install b --reinstall -y -qq 2>&1 > /dev/null
 testdpkgnotinstalled a
 testdpkginstalled b c
 testmarkedauto 'b'
 
+sed -i rootdir/var/log/apt/history.log -e '/^Commandline: / d' -e '/^Start-Date: / d' -e '/^End-Date: / d'
+testfileequal 'rootdir/var/log/apt/history.log' '
+Reinstall: b:i386 (1.0)'
+
 testequal 'Reading package lists...
 Building dependency tree...
 Reading state information...
diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
new file mode 100755
index 000000000..c91e77844
--- /dev/null
+++ b/test/integration/test-pin-non-existent-package
@@ -0,0 +1,72 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertpackage 'unstable' 'apt' 'i386' '0.8.15'
+insertpackage 'unstable' 'arch' 'i386' '1.0'
+
+setupaptarchive
+
+testcandidate() {
+	msgtest "Test that the Candidate for $1 is" $2
+	if [ "$(aptcache policy $1 | grep '^  Candidate:')" = "  Candidate: $2" ]; then
+		msgpass
+	else
+		echo
+		aptcache policy $1
+		msgfail
+	fi
+}
+
+testcandidate apt '0.8.15'
+testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+
+echo 'Package: apt
+Pin: release a=unstable
+Pin-Priority: -1' > rootdir/etc/apt/preferences
+
+testcandidate apt '(none)'
+testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+
+echo '
+Package: doesntexist
+Pin: release a=unstable
+Pin-Priority: 1000' >> rootdir/etc/apt/preferences
+
+testcandidate apt '(none)'
+
+echo '
+Package: apt
+Pin: release a=unstable
+Pin-Priority: 1000' >> rootdir/etc/apt/preferences
+
+testcandidate apt '(none)'
+testequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
+
+testequal 'Reading package lists...
+Building dependency tree...
+0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.' aptget dist-upgrade
+
+echo 'Package: arch:amd64
+Pin: release a=unstable
+Pin-Priority: -1' > rootdir/etc/apt/preferences
+
+testcandidate arch '1.0'
+
+echo '
+Package: arch:i386
+Pin: release a=unstable
+Pin-Priority: -1' >> rootdir/etc/apt/preferences
+
+testcandidate arch '(none)'
+
diff --git a/test/integration/test-resolve-by-keep-new-recommends b/test/integration/test-resolve-by-keep-new-recommends
new file mode 100755
index 000000000..8134b76aa
--- /dev/null
+++ b/test/integration/test-resolve-by-keep-new-recommends
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertinstalledpackage 'foo' 'i386' '1.0'
+insertpackage 'unstable' 'foo' 'i386' '2.0' 'Recommends: bar'
+
+setupaptarchive
+
+UPGRADE_KEEP="Reading package lists...
+Building dependency tree...
+The following packages have been kept back:
+  foo
+0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded."
+testequal "$UPGRADE_KEEP" aptget upgrade -s
+
diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
new file mode 100755
index 000000000..d97011914
--- /dev/null
+++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture 'i386'
+
+insertpackage 'unstable' 'apt' 'i386' '0.8.11'
+
+setupaptarchive
+
+rm -rf rootdir/var/lib/apt/lists
+
+find aptarchive/ -name 'Release.gpg' -delete
+find aptarchive/ -name 'InRelease' -exec cp {} {}.old \;
+
+for RELEASE in $(find aptarchive/ -name 'InRelease'); do
+	(echo 'Origin: Marvin
+Label: Marvin
+Suite: experimental
+Codename: experimental
+MD5Sum:
+ 65fd410587b6978de2277f2912523f09     9360 Packages
+ d27b294ed172a1fa9dd5a53949914c5d     4076 Packages.bz2
+ 2182897e0a2a0c09e760beaae117a015     2023 Packages.diff/Index
+ 1b895931853981ad8204d2439821b999     4144 Packages.gz'; echo; cat ${RELEASE}.old;) > ${RELEASE}
+done
+aptget update -qq > /dev/null 2> starts-with-unsigned.msg
+sed -i 's#File .*InRelease#File InRelease#' starts-with-unsigned.msg
+testfileequal starts-with-unsigned.msg "W: GPG error: file: unstable InRelease: File InRelease doesn't start with a clearsigned message"
diff --git a/test/integration/test-ubuntu-bug-806274-install-suggests b/test/integration/test-ubuntu-bug-806274-install-suggests
new file mode 100755
index 000000000..fb72f0999
--- /dev/null
+++ b/test/integration/test-ubuntu-bug-806274-install-suggests
@@ -0,0 +1,81 @@
+#!/bin/sh
+set -e
+
+TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+insertpackage 'unstable' 'apt' 'i386' '0.8.15' 'Depends: foo
+Recommends: bar
+Suggests: baz'
+insertpackage 'unstable' 'foo' 'i386' '1.0'
+insertpackage 'unstable' 'bar' 'i386' '1.0'
+insertpackage 'unstable' 'baz' 'i386' '1.0'
+
+setupaptarchive
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  bar foo
+Suggested packages:
+  baz
+The following NEW packages will be installed:
+  apt bar foo
+0 upgraded, 3 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [i386])
+Conf foo (1.0 unstable [i386])
+Inst apt (0.8.15 unstable [i386])
+Conf apt (0.8.15 unstable [i386])
+Inst bar (1.0 unstable [i386])
+Conf bar (1.0 unstable [i386])' aptget install apt -s --install-recommends --no-install-suggests
+
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  bar baz foo
+The following NEW packages will be installed:
+  apt bar baz foo
+0 upgraded, 4 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [i386])
+Conf foo (1.0 unstable [i386])
+Inst apt (0.8.15 unstable [i386])
+Conf apt (0.8.15 unstable [i386])
+Inst bar (1.0 unstable [i386])
+Inst baz (1.0 unstable [i386])
+Conf bar (1.0 unstable [i386])
+Conf baz (1.0 unstable [i386])' aptget install apt -s --install-recommends --install-suggests
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  foo
+Suggested packages:
+  baz
+Recommended packages:
+  bar
+The following NEW packages will be installed:
+  apt foo
+0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [i386])
+Conf foo (1.0 unstable [i386])
+Inst apt (0.8.15 unstable [i386])
+Conf apt (0.8.15 unstable [i386])' aptget install apt -s --no-install-recommends --no-install-suggests
+
+testequal 'Reading package lists...
+Building dependency tree...
+The following extra packages will be installed:
+  baz foo
+Recommended packages:
+  bar
+The following NEW packages will be installed:
+  apt baz foo
+0 upgraded, 3 newly installed, 0 to remove and 0 not upgraded.
+Inst foo (1.0 unstable [i386])
+Conf foo (1.0 unstable [i386])
+Inst apt (0.8.15 unstable [i386])
+Conf apt (0.8.15 unstable [i386])
+Inst baz (1.0 unstable [i386])
+Conf baz (1.0 unstable [i386])' aptget install apt -s --no-install-recommends --install-suggests