* merged fixes from the debian-sid bzr branch:

* Simplified Chinese (Aron Xu). Closes: #594458 * Bulgarian (Damyan Ivanov). Closes: #594627 * Portuguese (Miguel Figueiredo). Closes: #594668 * Korean (Changwoo Ryu). Closes: #594809 * Portuguese (Américo Monteiro) * cmdline/apt-cache.cc: - remove useless GetInitialize method * cmdline/apt-get.cc: - remove direct calls of ReadMainList and use the wrapper instead to protect us from useless re-reads and two-times notice display - remove death code by removing unused GetInitialize * apt-pkg/depcache.cc: - now that apt-get purge works on 'rc' packages let the MarkDelete pass this purge forward to the non-pseudo package for pseudos * apt-pkg/contrib/fileutl.cc: - apply SilentlyIgnore also on files without an extension * apt-pkg/contrib/configuration.cc: - fix autoremove by using correct config-option name and don't make faulty assumptions in error handling (Closes: #594689) * apt-pkg/versionmatch.cc: - let the pin origin actually work as advertised in the manpage which means "" are optional and pinning a local archive does work - even if it is a non-flat archive (Closes: #594435)
author: Michael Vogt <michael.vogt@ubuntu.com> 2010-08-30 12:29:52 +0200
committer: Michael Vogt <michael.vogt@ubuntu.com> 2010-08-30 12:29:52 +0200
commit: 927cd722ce0e21c290a00eaa5670f0d41287a7df (patch)
tree: 3382089c284d47f0971af775ea3ca75c6d44beab
parent: 1497b87da18106b38f004990ca4bf7ee79862b1d (diff)
parent: 4cb0cd1648e4a2623cb00a11b2db2649e286706d (diff)
16 files changed, 1125 insertions, 1119 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 81cc87d15..cc7093fe2 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -857,19 +857,27 @@ Configuration::MatchAgainstConfig::MatchAgainstConfig(char const * Config)
       {
 	 regfree(p);
 	 delete p;
+	 clearPatterns();
 	 _error->Warning("Regex compilation error for '%s' in configuration option '%s'",
 				s->c_str(), Config);
+	 return;
       }
-    }
-
+   }
+   if (strings.size() == 0)
+      patterns.push_back(NULL);
 }
 									/*}}}*/
 // MatchAgainstConfig Destructor					/*{{{*/
 Configuration::MatchAgainstConfig::~MatchAgainstConfig()
 {
+   clearPatterns();
+}
+void Configuration::MatchAgainstConfig::clearPatterns()
+{
    for(std::vector<regex_t *>::const_iterator p = patterns.begin();
 	p != patterns.end(); ++p)
    {
+      if (*p == NULL) continue;
       regfree(*p);
       delete *p;
    }
@@ -880,7 +888,7 @@ bool Configuration::MatchAgainstConfig::Match(char const * str) const
 {
    for(std::vector<regex_t *>::const_iterator p = patterns.begin();
 	p != patterns.end(); ++p)
-      if (regexec(*p, str, 0, 0, 0) == 0)
+      if (*p != NULL && regexec(*p, str, 0, 0, 0) == 0)
 	 return true;
 
    return false;
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index cbe18e4e5..175c1bef3 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -109,6 +109,7 @@ class Configuration
    class MatchAgainstConfig
    {
      std::vector<regex_t *> patterns;
+     void clearPatterns();
 
    public:
      MatchAgainstConfig(char const * Config);
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 91aecee65..2b73d1424 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -309,7 +309,8 @@ std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> c
 	    {
 	       if (Debug == true)
 		  std::clog << "Bad file: " << Ent->d_name << " → no extension" << std::endl;
-	       _error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str());
+	       if (SilentIgnore.Match(Ent->d_name) == false)
+		  _error->Notice("Ignoring file '%s' in directory '%s' as it has no filename extension", Ent->d_name, Dir.c_str());
 	       continue;
 	    }
 	 }
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 00bf68af1..018b05e65 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1149,7 +1149,7 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
       return;
 
    if (DebugMarker == true)
-      std::clog << OutputInDepth(Depth) << "MarkDelete " << Pkg << " FU=" << FromUser << std::endl;
+      std::clog << OutputInDepth(Depth) << (rPurge ? "MarkPurge " : "MarkDelete ") << Pkg << " FU=" << FromUser << std::endl;
 
    RemoveSizes(Pkg);
    RemoveStates(Pkg);
@@ -1167,6 +1167,15 @@ void pkgDepCache::MarkDelete(PkgIterator const &Pkg, bool rPurge,
    // if we remove the pseudo package, we also need to remove the "real"
    if (Pkg->CurrentVer != 0 && Pkg.CurrentVer().Pseudo() == true)
       MarkDelete(Pkg.Group().FindPkg("all"), rPurge, Depth+1, FromUser);
+   else if (rPurge == true && Pkg->CurrentVer == 0 &&
+	    Pkg->CurrentState != pkgCache::State::NotInstalled &&
+	    strcmp(Pkg.Arch(), "all") != 0)
+   {
+      PkgIterator const allPkg = Pkg.Group().FindPkg("all");
+      if (allPkg.end() == false && allPkg->CurrentVer == 0 &&
+	  allPkg->CurrentState != pkgCache::State::NotInstalled)
+	 MarkDelete(allPkg, rPurge, Depth+1, FromUser);
+   }
 }
 									/*}}}*/
 // DepCache::IsDeleteOk - check if it is ok to remove this package	/*{{{*/
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 45276dc95..08e683558 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -186,7 +186,7 @@ class pkgDepCache : protected pkgCache::Namespace
    class DefaultRootSetFunc : public InRootSetFunc, public Configuration::MatchAgainstConfig
    {
    public:
-     DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverRemove") {};
+     DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverAutoRemove") {};
      virtual ~DefaultRootSetFunc() {};
 
      bool InRootSet(const pkgCache::PkgIterator &pkg) { return pkg.end() == true && Match(pkg.Name()); };
diff --git a/apt-pkg/versionmatch.cc b/apt-pkg/versionmatch.cc
index 093180f9b..17a54bc4c 100644
--- a/apt-pkg/versionmatch.cc
+++ b/apt-pkg/versionmatch.cc
@@ -118,7 +118,10 @@ pkgVersionMatch::pkgVersionMatch(string Data,MatchType Type) : Type(Type)
    
    if (Type == Origin)
    {
-      OrSite = Data;
+      if (Data[0] == '"' && Data.end()[-1] == '"')
+	 OrSite = Data.substr(1, Data.length() - 2);
+      else
+	 OrSite = Data;
       return;
    }   
 }
@@ -259,10 +262,10 @@ bool pkgVersionMatch::FileMatch(pkgCache::PkgFileIterator File)
    if (Type == Origin)
    {
       if (OrSite.empty() == false) {
-	 if (File->Site == 0 || !ExpressionMatches(OrSite, File.Site()))
+	 if (File->Site == 0)
 	    return false;
       } else // so we are talking about file:// or status file
-	 if (strcmp(File.Site(),"") == 0 && File->Archive != 0) // skip the status file
+	 if (strcmp(File.Site(),"") == 0 && File->Archive != 0 && strcmp(File.Archive(),"now") == 0) // skip the status file
 	    return false;
       return (ExpressionMatches(OrSite, File.Site())); /* both strings match */
    }
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index 74a4f69c2..ba4ad1943 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1781,15 +1781,6 @@ bool ShowHelp(CommandLine &Cmd)
    return true;
 }
 									/*}}}*/
-// CacheInitialize - Initialize things for apt-cache			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void CacheInitialize()
-{
-   _config->Set("quiet",0);
-   _config->Set("help",false);
-}
-									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
    CommandLine::Args Args[] = {
@@ -1841,8 +1832,6 @@ int main(int argc,const char *argv[])					/*{{{*/
                                     {"madison",&Madison},
                                     {0,0}};
 
-   CacheInitialize();
-
    // Set up gettext support
    setlocale(LC_ALL,"");
    textdomain(PACKAGE);
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9b69e9589..d1c010e49 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1084,13 +1084,13 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
       return false;
 
    // Read the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return _error->Error(_("The list of sources could not be read."));
+   if (Cache.BuildSourceList() == false)
+      return false;
+   pkgSourceList *List = Cache.GetSourceList();
    
    // Create the package manager and prepare to download
    SPtr<pkgPackageManager> PM= _system->CreatePM(Cache);
-   if (PM->GetArchives(&Fetcher,&List,&Recs) == false || 
+   if (PM->GetArchives(&Fetcher,List,&Recs) == false || 
        _error->PendingError() == true)
       return false;
 
@@ -1306,7 +1306,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
       
       // Reload the fetcher object and loop again for media swapping
       Fetcher.Shutdown();
-      if (PM->GetArchives(&Fetcher,&List,&Recs) == false)
+      if (PM->GetArchives(&Fetcher,List,&Recs) == false)
 	 return false;
       
       _system->Lock();
@@ -1542,11 +1542,13 @@ bool DoUpdate(CommandLine &CmdL)
 {
    if (CmdL.FileSize() != 1)
       return _error->Error(_("The update command takes no arguments"));
-   
+
+   CacheFile Cache;
+
    // Get the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
+   if (Cache.BuildSourceList() == false)
       return false;
+   pkgSourceList *List = Cache.GetSourceList();
 
    // Create the progress
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));
@@ -1564,7 +1566,7 @@ bool DoUpdate(CommandLine &CmdL)
 
       // Populate it with the source selection and get all Indexes 
       // (GetAll=true)
-      if (List.GetIndexes(&Fetcher,true) == false)
+      if (List->GetIndexes(&Fetcher,true) == false)
 	 return false;
 
       pkgAcquire::UriIterator I = Fetcher.UriBegin();
@@ -1575,9 +1577,8 @@ bool DoUpdate(CommandLine &CmdL)
    }
 
    // do the work
-   CacheFile Cache;
    if (_config->FindB("APT::Get::Download",true) == true)
-       ListUpdate(Stat, List);
+       ListUpdate(Stat, *List);
 
    // Rebuild the cache.   
    if (Cache.BuildCaches() == false)
@@ -2189,13 +2190,13 @@ bool DoSource(CommandLine &CmdL)
       return _error->Error(_("Must specify at least one package to fetch source for"));
    
    // Read the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return _error->Error(_("The list of sources could not be read."));
+   if (Cache.BuildSourceList() == false)
+      return false;
+   pkgSourceList *List = Cache.GetSourceList();
    
    // Create the text record parsers
    pkgRecords Recs(Cache);
-   pkgSrcRecords SrcRecs(List);
+   pkgSrcRecords SrcRecs(*List);
    if (_error->PendingError() == true)
       return false;
 
@@ -2480,13 +2481,13 @@ bool DoBuildDep(CommandLine &CmdL)
       return _error->Error(_("Must specify at least one package to check builddeps for"));
    
    // Read the source list
-   pkgSourceList List;
-   if (List.ReadMainList() == false)
-      return _error->Error(_("The list of sources could not be read."));
+   if (Cache.BuildSourceList() == false)
+      return false;
+   pkgSourceList *List = Cache.GetSourceList();
    
    // Create the text record parsers
    pkgRecords Recs(Cache);
-   pkgSrcRecords SrcRecs(List);
+   pkgSrcRecords SrcRecs(*List);
    if (_error->PendingError() == true)
       return false;
 
@@ -2833,22 +2834,6 @@ bool ShowHelp(CommandLine &CmdL)
    return true;
 }
 									/*}}}*/
-// GetInitialize - Initialize things for apt-get			/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-void GetInitialize()
-{
-   _config->Set("quiet",0);
-   _config->Set("help",false);
-   _config->Set("APT::Get::Download-Only",false);
-   _config->Set("APT::Get::Simulate",false);
-   _config->Set("APT::Get::Assume-Yes",false);
-   _config->Set("APT::Get::Fix-Broken",false);
-   _config->Set("APT::Get::Force-Yes",false);
-   _config->Set("APT::Get::List-Cleanup",true);
-   _config->Set("APT::Get::AutomaticRemove",false);
-}
-									/*}}}*/
 // SigWinch - Window size change signal handler				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
diff --git a/debian/changelog b/debian/changelog
index f9fbc43cc..ead815d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+apt (0.8.0ubuntu3) UNRELEASED; urgency=low
+
+  * merged fixes from the debian-sid bzr branch:
+  
+  [ Programs translations ]
+  * Simplified Chinese (Aron Xu). Closes: #594458
+  * Bulgarian (Damyan Ivanov). Closes: #594627
+  * Portuguese (Miguel Figueiredo). Closes: #594668
+  * Korean (Changwoo Ryu). Closes: #594809
+
+  [ Manpages translations ]
+  * Portuguese (Américo Monteiro)
+
+  [ David Kalnischkies ]
+  * cmdline/apt-cache.cc:
+    - remove useless GetInitialize method
+  * cmdline/apt-get.cc:
+    - remove direct calls of ReadMainList and use the wrapper instead
+      to protect us from useless re-reads and two-times notice display
+    - remove death code by removing unused GetInitialize
+  * apt-pkg/depcache.cc:
+    - now that apt-get purge works on 'rc' packages let the MarkDelete
+      pass this purge forward to the non-pseudo package for pseudos
+  * apt-pkg/contrib/fileutl.cc:
+    - apply SilentlyIgnore also on files without an extension
+  * apt-pkg/contrib/configuration.cc:
+    - fix autoremove by using correct config-option name and
+      don't make faulty assumptions in error handling (Closes: #594689)
+  * apt-pkg/versionmatch.cc:
+    - let the pin origin actually work as advertised in the manpage
+      which means "" are optional and pinning a local archive does
+      work - even if it is a non-flat archive (Closes: #594435)
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 30 Aug 2010 11:53:30 +0200
+
 apt (0.8.0ubuntu2) maverick; urgency=low
 
   * merged fixes from the debian-sid bzr branch:
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 1fb706d41..02971023e 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1,13 +1,13 @@
 # Translation of apt manpages to Portuguese
 # Copyright (C) 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the apt-doc package.
+# This file is distributed under the same license as the apt package.
 #
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.7.26~exp3\n"
-"POT-Creation-Date: 2010-07-30 12:46+0300\n"
-"PO-Revision-Date: 2010-03-19 00:21+0000\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"
+"POT-Creation-Date: 2010-08-23 18:46-0300\n"
+"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"
 "Language: pt\n"
@@ -44,7 +44,7 @@ msgstr "NOME"
 #. type: Plain text
 #: apt.8:20
 msgid "apt - Advanced Package Tool"
-msgstr "apt - Advanced Package Tool"
+msgstr "apt - Ferramenta de Pacotes Avançada"
 
 #. type: SH
 #: apt.8:20
@@ -793,17 +793,7 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent:264
-#, fuzzy, no-wrap
-#| msgid ""
-#| "     <varlistentry>\n"
-#| "      <term><option>-c</option></term>\n"
-#| "      <term><option>--config-file</option></term>\n"
-#| "     <listitem><para>Configuration File; Specify a configuration file to use. \n"
-#| "     The program will read the default configuration file and then this \n"
-#| "     configuration file. See &apt-conf; for syntax information.     \n"
-#| "     </para>\n"
-#| "     </listitem>\n"
-#| "     </varlistentry>\n"
+#, no-wrap
 msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
@@ -820,9 +810,13 @@ msgstr ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
-"     <listitem><para>Ficheiro de Configuração; Especifica um ficheiro de configuração a usar. \n"
+"     <listitem><para>Ficheiro de Configuração; Especifica o ficheiro de \n"
+"     configuração a usar. \n"
 "     O programa irá ler o ficheiro de configuração predefinido e depois este \n"
-"     ficheiro de configuração. Veja &apt-conf; para informação de sintaxe.     \n"
+"     ficheiro de configuração. Se as definições de configuração precisarem de \n"
+"     ser definidas antes, os ficheiros de configuração predefinidos são \n"
+"     analisados especificando um ficheiro com a variável de ambiente \n"
+"     <envar>APT_CONFIG</envar>. Veja &apt-conf; para informação de sintaxe.\n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
@@ -1087,13 +1081,7 @@ msgstr ""
 
 #. type: Plain text
 #: apt.ent:373
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY file-sourceslist \"\n"
-#| "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-#| "     <listitem><para>Locations to fetch packages from.\n"
-#| "     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-#| "     </varlistentry>\n"
+#, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
 "      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
@@ -1103,11 +1091,13 @@ msgid ""
 "      </varlistentry>\n"
 "\">\n"
 msgstr ""
-"<!ENTITY file-sourceslist \"\n"
-"     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-"     <listitem><para>Localizações de onde obter pacotes.\n"
-"     Item de Configuração: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-"     </varlistentry>\n"
+"<!ENTITY file-extended_states \"\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <listitem><para>Lista de estado de pacotes auto-instalados.\n"
+"      Item de Configuração: <literal>Dir::State::extended_states</literal>.\n"
+"      </para></listitem>\n"
+"      </varlistentry>\n"
+"\">\n"
 
 #. type: Plain text
 #: apt.ent:377
@@ -1163,6 +1153,8 @@ msgid ""
 "<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
 "ENTITY testing-codename \"squeeze\">"
 msgstr ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
 
 #.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
@@ -1878,67 +1870,46 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:312
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
 msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-pre-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:313
-#, fuzzy
-#| msgid "<option>--no-download</option>"
 msgid "<option>--no-depends</option>"
-msgstr "<option>--no-download</option>"
+msgstr "<option>--no-depends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:314
-#, fuzzy
-#| msgid "<option>--install-recommends</option>"
 msgid "<option>--no-recommends</option>"
-msgstr "<option>--install-recommends</option>"
+msgstr "<option>--no-recommends</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:315
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
 msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:316
-#, fuzzy
-#| msgid "<option>--no-mount</option>"
 msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-mount</option>"
+msgstr "<option>--no-conflicts</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:317
-#, fuzzy
-#| msgid "<option>--no-act</option>"
 msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-breaks</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:318
-#, fuzzy
-#| msgid "<option>--no-act</option>"
 msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-replaces</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:319
-#, fuzzy
-#| msgid "<option>--no-act</option>"
 msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-enhances</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:320
-#, fuzzy
-#| msgid ""
-#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
-#| "so that all packages mentioned are printed once.  Configuration Item: "
-#| "<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 "
@@ -1946,9 +1917,11 @@ msgid ""
 "Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
 "Cache::ShowRecommends</literal>."
 msgstr ""
-"Torna <literal>depends</literal> e <literal>rdepends</literal> recursivo "
-"para que todos os pacotes mencionados sejam escritos uma vez. Item de "
-"Configuração <literal>APT::Cache::RecurseDepends</literal>."
+"Por predefinição o <literal>depends</literal> e <literal>rdepends</literal> "
+"escrevem todas as dependências. Isto pode ser afinado com estas bandeiras "
+"que irão omitir o tipo de dependência especificado. Item de Configuração: "
+"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
+"ex. <literal>APT::Cache::ShowRecommends</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
@@ -2811,16 +2784,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:119
-#, fuzzy
-#| msgid ""
-#| "Values for the additional metadata fields in the Release file are taken "
-#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
-#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>.  The "
-#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
-#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-#| "<literal>Codename</literal>, <literal>Date</literal>, "
-#| "<literal>Architectures</literal>, <literal>Components</literal>, "
-#| "<literal>Description</literal>."
 msgid ""
 "Values for the additional metadata fields in the Release file are taken from "
 "the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -3065,23 +3028,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:229
-#, fuzzy
-#| msgid "Contents::Compress"
 msgid "Translation::Compress"
-msgstr "Contents::Compress"
+msgstr "Translation::Compress"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:231
-#, fuzzy
-#| msgid ""
-#| "This is similar to <literal>Packages::Compress</literal> except that it "
-#| "controls the compression for the Contents files."
 msgid ""
 "This is similar to <literal>Packages::Compress</literal> except that it "
 "controls the compression for the Translation-en master file."
 msgstr ""
 "Isto é semelhante a <literal>Packages::Compress</literal> excepto que "
-"controla a compressão para os ficheiros de Conteúdos."
+"controla a compressão para o ficheiro mestre Translation-en."
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:235
@@ -3116,10 +3073,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
-#, fuzzy
-#| msgid "Description"
 msgid "LongDescription"
-msgstr "Descrição"
+msgstr "LongDescription"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
@@ -3127,6 +3082,8 @@ msgid ""
 "Sets if long descriptions should be included in the Packages file or split "
 "out into a master Translation-en file."
 msgstr ""
+"Define se as descrições longas devem ser incluídas no ficheiro Packages ou "
+"divididas em um ficheiro Translation-en mestre."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:257
@@ -3241,10 +3198,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:306
-#, fuzzy
-#| msgid "Operation"
 msgid "Translation"
-msgstr "Operação"
+msgstr "Translation"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:308
@@ -3253,6 +3208,9 @@ msgid ""
 "should be not included in the Packages file. Defaults to <filename>$(DIST)/"
 "$(SECTION)/i18n/Translation-en</filename>"
 msgstr ""
+"Define se o ficheiro mestre Translation-en de saída com as descrições longas "
+"não deve ser incluído no ficheiro Packages. A predefinição é <filename>"
+"$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
 #: apt-ftparchive.1.xml:313
@@ -3370,12 +3328,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:364
-#, fuzzy
-#| msgid ""
-#| "The <literal>Tree</literal> section takes a scope tag which sets the "
-#| "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
-#| "path is prefixed by <literal>ArchiveDir</literal>).  Typically this is a "
-#| "setting such as <filename>dists/woody</filename>."
 msgid ""
 "The <literal>Tree</literal> section takes a scope tag which sets the "
 "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3385,7 +3337,7 @@ msgstr ""
 "A secção <literal>Tree</literal> recebe uma etiqueta scope que define a "
 "variável <literal>$(DIST)</literal> e define a raiz da árvore (o caminho é "
 "prefixado por <literal>ArchiveDir</literal>). Tipicamente esta é uma "
-"definição tal como <filename>dists/woody</filename>."
+"definição tal como <filename>dists/&stable-codename;</filename>."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt-ftparchive.1.xml:369
@@ -3826,13 +3778,6 @@ msgstr "<option>APT::FTPArchive::LongDescription</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:595
-#, fuzzy
-#| msgid ""
-#| "This configuration option defaults to \"<literal>true</literal>\" and "
-#| "should only be set to <literal>\"false\"</literal> if the Archive "
-#| "generated with &apt-ftparchive; also provides <filename>Translation</"
-#| "filename> files. Note that it is currently not possible to create these "
-#| "files with <command>apt-ftparchive</command>."
 msgid ""
 "This configuration option defaults to \"<literal>true</literal>\" and should "
 "only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3843,8 +3788,8 @@ msgstr ""
 "Esta opção de configuração tem a predefinição de \"<literal>true</literal>\" "
 "e deve apenas ser definida para <literal>\"false\"</literal> se o Arquivo "
 "gerado com &apt-ftparchive; também disponibilizar ficheiros "
-"<filename>Translation</filename>. Note que actualmente não é possível criar "
-"esses ficheiros com <command>apt-ftparchive</command>."
+"<filename>Translation</filename>. Note que o ficheiro mestre "
+"<filename>Translation-en</filename> só pode ser criado no comando generate."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
@@ -3900,41 +3845,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-get.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
 msgid ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@ -3966,30 +3876,22 @@ msgstr ""
 "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
 "<option>-o= <replaceable>string_de_configuração</replaceable> </option> </"
 "arg> <arg> <option>-c= <replaceable>ficheiro_de_configuração</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-"choice='plain'> <replaceable>nome_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> "
-"<replaceable>expressão_de_número_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> "
-"<replaceable>nome_de_código_do_lançamento_de_destino</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>número_de_versão_do_pacote</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>nome_do_lançamento_de_destino</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nome_de_código_do_lançamento_de_destino</"
-"replaceable> </arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable></"
-"arg></arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
+"<replaceable>lançamento_de_destino</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>número_de_versão_do_pacote</replaceable> </"
+"arg> <arg choice='plain'> /<replaceable>lançamento_de_destino</replaceable> "
+"</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
 "\"><replaceable>pacote</replaceable></arg></arg> <arg choice='plain'>source "
 "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pacote</replaceable> <arg> "
 "<group choice='req'> <arg choice='plain'> "
 "=<replaceable>número_de_versão_do_pacote</replaceable> </arg> <arg "
-"choice='plain'> /<replaceable>nome_de_lançamento_de_destino</replaceable> </"
-"arg> <arg choice='plain'> /"
-"<replaceable>nome_de_código_de_lançamento_de_destino</replaceable> </arg> </"
+"choice='plain'> /<replaceable>lançamento_de_destino</replaceable> </arg> </"
 "group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
 "\" rep=\"repeat\"><replaceable>pacote</replaceable></arg></arg> <arg "
 "choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
@@ -4001,12 +3903,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-get.8.xml:112
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library.  Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic;, &gnome-apt; and &wajig;."
 msgid ""
 "<command>apt-get</command> is the command-line tool for handling packages, "
 "and may be considered the user's \"back-end\" to other tools using the APT "
@@ -4016,8 +3912,7 @@ msgstr ""
 "<command>apt-get</command> é a ferramenta de linha de comandos para lidar "
 "com pacotes, e pode ser considerada o \"back-end\" dos utilizadores para "
 "outras ferramentas que usam a biblioteca APT. Existem várias interfaces "
-"\"front-end\" como o &dselect;, &aptitude;, &synaptic;, &gnome-apt; e "
-"&wajig;."
+"\"front-end\" como o &dselect;, &aptitude;, &synaptic; e &wajig;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:121 apt-key.8.xml:124
@@ -5467,7 +5362,7 @@ msgstr "Mostra a versão do programa."
 #. type: Content of: <refentry><refsect1><variablelist>
 #: apt-mark.8.xml:124
 msgid "  &file-extended_states;"
-msgstr ""
+msgstr "  &file-extended_states;"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-mark.8.xml:129
@@ -6192,12 +6087,6 @@ msgstr "Default-Release"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:153
-#, fuzzy
-#| msgid ""
-#| "Default release to install packages from if more than one version "
-#| "available. Contains release name, codename or release version. Examples: "
-#| "'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See "
-#| "also &apt-preferences;."
 msgid ""
 "Default release to install packages from if more than one version available. "
 "Contains release name, codename or release version. Examples: 'stable', "
@@ -6206,8 +6095,8 @@ msgid ""
 msgstr ""
 "Lançamento predefinido de onde instalar pacotes se existir mais de uma "
 "versão disponível. Contém o nome do lançamento, nome de código ou versão de "
-"lançamento. Exemplos: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', "
-"'4.0', '5.0*'. Veja também &apt-preferences;."
+"lançamento. Exemplos: 'stable', 'testing', 'unstable', '&stable-codename;', "
+"'&testing-codename;', '4.0', '5.0*'. Veja também &apt-preferences;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:158
@@ -6336,7 +6225,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:202
 msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
+msgstr "Cache-Start, Cache-Grow e Cache-Limit"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:203
@@ -6357,6 +6246,23 @@ msgid ""
 "literal> is 0 which stands for no limit.  If <literal>Cache-Grow</literal> "
 "is set to 0 the automatic grow of the cache is disabled."
 msgstr ""
+"O APT usa desde a versão 0.7.26 um ficheiro de cache com mapa de memória de "
+"tamanho ajustável para armazenar a informação disponível. <literal>Cache-"
+"Start</literal> actua como uma dica para que tamanho a Cache irá crescer e é "
+"por isso a quantidade de memória que o APT irá requerer no arranque. O valor "
+"predefinido é 20971520 bytes (~20 MB). Note que esta quantidade de espaço "
+"precisa estar disponível para o APT caso contrário ele irá con certeza "
+"falhar, portanto para dispositivos com pouca memória este valor deve ser "
+"diminuído enquanto que em sistemas com muitas fontes configuradas este pode "
+"ser aumentado. <literal>Cache-Grow</literal> define em bytes com a "
+"predefinição de 1048576 (~1 MB) quanto o tamanho da Cache será aumentado no "
+"caso do espaço definido por <literal>Cache-Start</literal> não ser "
+"suficiente. Este valor será aplicado várias vezes até que a cache seja "
+"suficientemente grande para armazenar toda a informação ou que o tamanho da "
+"cache alcance o <literal>Cache-Limit</literal>. O valor predefinido de "
+"<literal>Cache-Limit</literal> é 0 o que significa nenhum limite. Se "
+"<literal>Cache-Grow</literal> for definido para 0, o crescimento automático "
+"da cache é desactivado."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:218
@@ -6420,7 +6326,7 @@ msgstr "O Grupo Acquire"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:244
 msgid "Check-Valid-Until"
-msgstr ""
+msgstr "Check-Valid-Until"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:245
@@ -6433,11 +6339,20 @@ msgid ""
 "header, but if they don't or a stricter value is volitional the following "
 "<literal>Max-ValidTime</literal> option can be used."
 msgstr ""
+"Opção relacionada com segurança com predefinição a 'verdadeiro' como uma "
+"validação expirada para um ficheiro Release previne ataques repetidos "
+"durante longo tempo e pode, por exemplo, ajudar os utilizadores a "
+"identificar mirrors que não são actualizados à muito tempo - mas a "
+"funcionalidade depende da precisão de hora no sistema do utilizador. Os "
+"responsáveis do arquivo são encorajados a criar ficheiros Release com o "
+"cabeçalho <literal>Valid-Until</literal>, mas se não o fizerem ou se "
+"preferir-se um valor mais rigoroso pode-se usar a opção <literal>Max-"
+"ValidTime</literal> seguinte."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:255
 msgid "Max-ValidTime"
-msgstr ""
+msgstr "Max-ValidTime"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:256
@@ -6452,6 +6367,15 @@ msgid ""
 "settings can be made by appending the label of the archive to the option "
 "name."
 msgstr ""
+"Segundos em que o ficheiro Release deve considerado válido após ser criado. "
+"A predefinição é \"para sempre\" (0) se o ficheiro Release do arquivo não "
+"conter um cabeçalho <literal>Valid-Until</literal>. Se o tiver então esta "
+"data é a predefinida. A data do ficheiro Release ou a data especificada pela "
+"hora de criação do do ficheiro Release (cabeçalho <literal>Date</literal>) "
+"mais os segundos especificados com esta opção são usados para verificar se a "
+"validação de um ficheiro já expirou ao usar uma data anterior às duas. "
+"Definições específicas do Arquivo podem ser feitas ao adicionar a etiqueta "
+"do arquivo ao nome da opção. "
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:268
@@ -6949,7 +6873,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:450
 msgid "GzipIndexes"
-msgstr ""
+msgstr "GzipIndexes"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:452
@@ -6959,6 +6883,10 @@ msgid ""
 "unpacking them. This saves quite a lot of disk space at the expense of more "
 "CPU requirements when building the local package caches. False by default."
 msgstr ""
+"Quando descarrega índices comprimidos em <literal>gzip</literal> (Pacotes, "
+"Fontes ou Traduções), mantêm-os localmente comprimidos em gzip em vez de os "
+"desempacotar. Isto poupa imenso espaço no disco à custa de mais pedidos à "
+"CPU quando constrói as caches de pacotes locais. Falso por predefinição."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:459
@@ -7162,6 +7090,13 @@ msgid ""
 "z]+</literal> is silently ignored. As seen in the last default value these "
 "patterns can use regular expression syntax."
 msgstr ""
+"A lista <literal>Ignore-Files-Silently</literal> pode ser usada para "
+"especificar quais os ficheiros que o APT deve ignorar em silêncio enquanto "
+"analisa os ficheiros nos directórios de fragmento. Por predefinição que "
+"termine com <literal>.disabled</literal>, <literal>~</literal>, <literal>."
+"bak</literal> ou <literal>.dpkg-[a-z]+</literal> é ignorado em silêncio. "
+"Como visto no último valor predefinido, estes padrões podem usar sintaxe de "
+"expressão regular."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt.conf.5.xml:541
@@ -8244,10 +8179,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:101
-#, fuzzy
-#| msgid "priority 100"
 msgid "priority 1"
-msgstr "priority 100"
+msgstr "priority 1"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:102
@@ -8256,6 +8189,9 @@ msgid ""
 "filename> files are marked as \"NotAutomatic: yes\" like the debian "
 "experimental archive."
 msgstr ""
+"para as versões vindas de arquivos cujos ficheiros <filename>Release</"
+"filename> estejam marcados como \"NotAutomatic: yes\" como o arquivo "
+"experimental da debian."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
 #: apt_preferences.5.xml:107
@@ -8306,11 +8242,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:123
-#, fuzzy
-#| msgid ""
-#| "If the target release has not been specified then APT simply assigns "
-#| "priority 100 to all installed package versions and priority 500 to all "
-#| "uninstalled package versions."
 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 "
@@ -8318,9 +8249,11 @@ msgid ""
 "their <filename>Release</filename> files are marked as \"NotAutomatic: yes\" "
 "- these versions get the priority 1."
 msgstr ""
-"Se o lançamento destinado não foi especificado, então o APT simplesmente "
+"Se o lançamento de destino não foi especificado, então o APT simplesmente "
 "atribui prioridade 100 a todas as versões de pacotes instalados e prioridade "
-"500 e todas as versões de pacotes não instalados."
+"500 e todas as versões de pacotes não instalados, à excepção de versões que "
+"venham de arquivos cujos ficheiros <filename>Release</filename> estejam "
+"marcados como \"NotAutomatic: yes\" - estas versões ficam com prioridade 1."
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:129
@@ -8513,32 +8446,25 @@ msgid ""
 "high priority to all versions available from the server identified by the "
 "hostname \"ftp.de.debian.org\""
 msgstr ""
+"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
+"\" que pode ser usada para corresponder a um nome de máquina. O seguinte "
+"registo irá atribuir uma alta prioridade a todas as versões disponíveis do "
+"servidor identificadas pelo nome de máquina \"ftp.de.debian.org\""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:210
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: origin \"\"\n"
-#| "Pin-Priority: 999\n"
+#, no-wrap
 msgid ""
 "Package: *\n"
 "Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 msgstr ""
 "Package: *\n"
-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
 "Pin-Priority: 999\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:214
-#, fuzzy
-#| msgid ""
-#| "A note of caution: the keyword used here is \"<literal>origin</literal>"
-#| "\".  This should not be confused with the Origin of a distribution as "
-#| "specified in a <filename>Release</filename> file.  What follows the "
-#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
-#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
 msgid ""
 "This should <emphasis>not</emphasis> be confused with the Origin of a "
 "distribution as specified in a <filename>Release</filename> file.  What "
@@ -8546,12 +8472,11 @@ msgid ""
 "Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
 "\"."
 msgstr ""
-"Uma nota de atenção: a palavra chave usada aqui é \"<literal>origin</literal>"
-"\". Isto não deve ser confundido com a Origem de uma distribuição como "
-"especificada num ficheiro <filename>Release</filename>. O que representa a "
-"etiqueta \"Origin:\" num ficheiro <filename>Release</filename> não é um "
-"endereço de Internet mas um nome de autor ou marca, tal como \"Debian\" ou "
-"\"Ximian\"."
+"Isto <emphasis>não</emphasis> deve ser confundido com a Origem de uma "
+"distribuição como especificada num ficheiro <filename>Release</filename>. O "
+"que representa a etiqueta \"Origin:\" num ficheiro <filename>Release</"
+"filename> não é um endereço de Internet mas um nome de autor ou marca, tal "
+"como \"Debian\" ou \"Ximian\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:219
@@ -8578,11 +8503,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
 #: apt_preferences.5.xml:228
-#, fuzzy
-#| msgid ""
-#| "The following record assigns a high priority to all package versions "
-#| "belonging to any distribution whose Codename is \"<literal>squeeze</"
-#| "literal>\"."
 msgid ""
 "The following record assigns a high priority to all package versions "
 "belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -8590,22 +8510,18 @@ msgid ""
 msgstr ""
 "O seguinte registo atribui uma alta prioridade a todas as versões de pacotes "
 "pertencentes a qualquer distribuição cujo nome de código é "
-"\"<literal>squeeze</literal>\"."
+"\"<literal>&testing-codename;</literal>\"."
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
 #: apt_preferences.5.xml:232
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
+#, no-wrap
 msgid ""
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 msgstr ""
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -8917,14 +8833,6 @@ msgstr "a linha <literal>Codename:</literal>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:392
-#, fuzzy
-#| msgid ""
-#| "names the codename to which all the packages in the directory tree "
-#| "belong.  For example, the line \"Codename: squeeze\" specifies that all "
-#| "of the packages in the directory tree below the parent of the "
-#| "<filename>Release</filename> file belong to a version named "
-#| "<literal>squeeze</literal>.  Specifying this value in the APT preferences "
-#| "file would require the line:"
 msgid ""
 "names the codename to which all the packages in the directory tree belong.  "
 "For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -8934,18 +8842,17 @@ msgid ""
 "preferences file would require the line:"
 msgstr ""
 "nomeia o nome de código a qual todos os pacotes na árvore de directórios "
-"pertencem. Por exemplo, a linha \"Codename: squeeze\" especifica que todos "
-"os pacotes na árvore de directórios abaixo do pai do ficheiro "
+"pertencem. Por exemplo, a linha \"Codename: &testing-codename;\" especifica "
+"que todos os pacotes na árvore de directórios abaixo do pai do ficheiro "
 "<filename>Release</filename> pertencem a uma versão chamada "
-"<literal>squeeze</literal>. Especificar este valor no ficheiro de "
+"<literal>&testing-codename;</literal>. Especificar este valor no ficheiro de "
 "preferências do APT requer a linha:"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
 #: apt_preferences.5.xml:401
-#, fuzzy, no-wrap
-#| msgid "Pin: release a=stable\n"
+#, no-wrap
 msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release a=stable\n"
+msgstr "Pin: release n=&testing-codename;\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:408
@@ -9054,17 +8961,6 @@ msgstr "Pin: release l=Debian\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:363
-#, fuzzy
-#| msgid ""
-#| "The <filename>Release</filename> file is normally found in the directory "
-#| "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-#| "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-#| "dists/woody/Release</filename>.  It consists of a single multi-line "
-#| "record which applies to <emphasis>all</emphasis> of the packages in the "
-#| "directory tree below its parent.  Unlike the <filename>Packages</"
-#| "filename> file, nearly all of the lines in a <filename>Release</filename> "
-#| "file are relevant for setting APT priorities: <placeholder type="
-#| "\"variablelist\" id=\"0\"/>"
 msgid ""
 "The <filename>Release</filename> file is normally found in the directory "
 "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -9079,9 +8975,9 @@ msgstr ""
 "O ficheiro <filename>Release</filename> fica normalmente no directório "
 "<filename>.../dists/<replaceable>nome da distribuição</replaceable></"
 "filename>: por exemplo, <filename>.../dists/stable/Release</filename>, ou "
-"<filename>.../dists/woody/Release</filename>. Consiste num único registo de "
-"várias linhas que se aplica a <emphasis>todos</emphasis> os pacotes na "
-"árvore de directórios sob o seu pai. Ao contrário do ficheiro "
+"<filename>.../dists/&stable-codename;/Release</filename>. Consiste num único "
+"registo de várias linhas que se aplica a <emphasis>todos</emphasis> os "
+"pacotes na árvore de directórios sob o seu pai. Ao contrário do ficheiro "
 "<filename>Packages</filename>, quase todas as linhas num ficheiro "
 "<filename>Release</filename> são relevantes para definir as prioridades do "
 "APT: <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -9312,22 +9208,7 @@ msgstr "Acompanhando a evolução de um nome de código de lançamento"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:600
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
-#| "\n"
-#| "Explanation: Debian unstable is always codenamed with sid\n"
-#| "Package: *\n"
-#| "Pin: release a=sid\n"
-#| "Pin-Priority: 800\n"
-#| "\n"
-#| "Package: *\n"
-#| "Pin: release o=Debian\n"
-#| "Pin-Priority: -10\n"
+#, no-wrap
 msgid ""
 "Explanation: Uninstall or do not install any Debian-originated package versions\n"
 "Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
@@ -9345,9 +9226,9 @@ msgid ""
 "Pin-Priority: -10\n"
 msgstr ""
 "Explicação: Desinstala ou não instala nenhumas versões de pacotes originais Debian\n"
-"Explicação: para além daquelas da distribuição com nome de código squeeze ou sid\n"
+"Explicação: para além daquelas da distribuição com nome de código &testing-codename; ou sid\n"
 "Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
 "\n"
 "Explicação: Debian unstable tem sempre o nome de código sid\n"
@@ -9387,12 +9268,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:617
-#, fuzzy
-#| msgid ""
-#| "With a suitable &sources-list; file and the above preferences file, any "
-#| "of the following commands will cause APT to upgrade to the latest version"
-#| "(s) in the release codenamed with <literal>squeeze</literal>.  "
-#| "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "With a suitable &sources-list; file and the above preferences file, any of "
 "the following commands will cause APT to upgrade to the latest version(s) in "
@@ -9401,8 +9276,8 @@ msgid ""
 msgstr ""
 "Com um ficheiro &sources-list; apropriado e o ficheiro de preferências "
 "acima, qualquer dos seguintes comandos fará com que o APT actualize para a "
-"versão mais recente no lançamento com nome de código <literal>squeeze</"
-"literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
+"versão mais recente no lançamento com nome de código <literal>&testing-"
+"codename;</literal>.  <placeholder type=\"programlisting\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:637
@@ -9412,15 +9287,6 @@ msgstr "apt-get install <replaceable>pacote</replaceable>/sid\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:628
-#, fuzzy
-#| msgid ""
-#| "The following command will cause APT to upgrade the specified package to "
-#| "the latest version from the <literal>sid</literal> distribution.  "
-#| "Thereafter, <command>apt-get upgrade</command> will upgrade the package "
-#| "to the most recent <literal>squeeze</literal> version if that is more "
-#| "recent than the installed version, otherwise, to the most recent "
-#| "<literal>sid</literal> version if that is more recent than the installed "
-#| "version.  <placeholder type=\"programlisting\" id=\"0\"/>"
 msgid ""
 "The following command will cause APT to upgrade the specified package to the "
 "latest version from the <literal>sid</literal> distribution.  Thereafter, "
@@ -9431,10 +9297,10 @@ msgid ""
 "<placeholder type=\"programlisting\" id=\"0\"/>"
 msgstr ""
 "O seguinte comando irá fazer com que o APT actualize o pacote especificado "
-"para a versão mais recente da distribuição <literal>sid</literal> "
-"distribution. Posteriormente, <command>apt-get upgrade</command> irá "
-"actualizar o pacote para a versão <literal>squeeze</literal> mais recente se "
-"essa for mais recente que a versão instalada, caso contrário, para a versão "
+"para a versão mais recente da distribuição <literal>sid</literal>. "
+"Posteriormente, <command>apt-get upgrade</command> irá actualizar o pacote "
+"para a versão <literal>&testing-codename;</literal> mais recente se essa for "
+"mais recente que a versão instalada, caso contrário, para a versão "
 "<literal>sid</literal> mais recente se essa for mais recente que a versão "
 "instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
 
@@ -9644,18 +9510,14 @@ msgstr "Alguns exemplos:"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
-#| "   "
+#, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
 "deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 msgstr ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
@@ -9858,23 +9720,18 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:208
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the stable/contrib area."
 msgid ""
 "Uses FTP to access the archive at ftp.debian.org, under the debian "
 "directory, and uses only the &stable-codename;/contrib area."
 msgstr ""
-"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório Debian, e "
-"usa apenas a área stable/contrib."
+"Usa FTP para aceder ao arquivo em ftp.debian.org, sob o directório debian, e "
+"usa apenas a área &stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml:210
-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, no-wrap
 msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:212
diff --git a/po/bg.po b/po/bg.po
index ca36579a2..aacc490d8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,20 +4,21 @@
 # This file is distributed under the same license as the apt package.
 #
 # Yavor Doganov <yavor@doganov.org>, 2006.
-# Damyan Ivanov <dmn@debian.org>, 2008, 2009.
+# Damyan Ivanov <dmn@debian.org>, 2008, 2009, 2010.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2009-01-27 12:41+0200\n"
+"PO-Revision-Date: 2010-08-27 22:33+0300\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Content-Transfer-Encoding: binary\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: cmdline/apt-cache.cc:156
@@ -30,9 +31,8 @@ msgid "Total package names: "
 msgstr "Общо имена на пакети : "
 
 #: cmdline/apt-cache.cc:286
-#, fuzzy
 msgid "Total package structures: "
-msgstr "Общо имена на пакети : "
+msgstr "Общо пакетни структури: "
 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
@@ -100,9 +100,8 @@ msgid "Package file %s is out of sync."
 msgstr "Пакетният файл %s не е синхронизиран."
 
 #: cmdline/apt-cache.cc:1273
-#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "Трябва да въведете само един израз"
+msgstr "Трябва да въведете поне един шаблон за търсене"
 
 #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 #: cmdline/apt-cache.cc:1508
@@ -161,7 +160,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
 
 #: cmdline/apt-cache.cc:1739
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -209,20 +207,21 @@ msgstr ""
 "кеш файлове на APT и извличане на информация от тях\n"
 "\n"
 "Команди:\n"
-"   add - Добавя пакетен файл към кеша на пакети с изходен код\n"
+"   add - Добавяне на пакетен файл към кеша на пакети с изходен код\n"
 "   gencaches - Генериране на кеша на пакети и пакети с изходен код\n"
-"   showpkg - Показва обща информация за даден пакет\n"
-"   showsrc - Показва записите на пакета с изходен код\n"
-"   stats - Показва някои общи статистики\n"
-"   dump - Показва целия файл в сбита форма\n"
-"   dumpavail - Разпечатва наличен файл в stdout\n"
-"   unmet - Показва неудовлетворени зависимости\n"
-"   search - Търси в списъка с пакети за регулярен израз\n"
-"   show - Показва запис за пакета\n"
-"   depends - Показва необработена информация за зависимости на пакета\n"
-"   rdepends - Показва информация за обратните зависимости на пакета\n"
+"   showpkg - Показване на обща информация за даден пакет\n"
+"   showsrc - Показване на записите за пакети с изходен код\n"
+"   stats - Показване на някои общи статистики\n"
+"   dump - Показване на целия файл в сбит вид\n"
+"   dumpavail - Извеждане на достъпните пакети на стандартния изход\n"
+"   unmet - Показване на неудовлетворените зависимости\n"
+"   search - Търсене в списъка с пакети за регулярен израз\n"
+"   show - Показване на записа за пакет\n"
+"   showauto - Списък с пакетите, инсталирани автоматично\n"
+"   depends - Необработена информация за зависимостите на даден пакет\n"
+"   rdepends - Информация за обратните зависимости на даден пакет\n"
 "   pkgnames - Списък с имената на всички пакети, за които има информация\n"
-"   dotty - Генериране на графики на пакети за GraphVis\n"
+"   dotty - Генериране на графики на пакети за GraphViz\n"
 "   xvcg - Генериране на графики на пакети за xvcg\n"
 "   policy - Показване на настройките на политиката\n"
 "\n"
@@ -233,23 +232,22 @@ msgstr ""
 "  -q   Премахване на индикатора за напредък.\n"
 "  -i   Показване само на важни зависимости при командата „unmet“.\n"
 "  -c=? Четене на този конфигурационен файл.\n"
-"  -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/"
-"tmp\n"
-"Вижте „man“ страниците apt-cache(8) и apt.conf(5) за повече информация.\n"
+"  -o=? Настройване на произволна конфигурационна опция, например -o dir::"
+"cache=/tmp\n"
+"За повече информация вижте наръчниците apt-cache(8) и apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:77
-#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Задайте име за този диск, като „Debian 2.1r1 Disk1“"
+msgstr "Укажете име за този диск, например „Debian 5.0.3 Disk1“"
 
 #: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Сложете диск в устройството и натиснете „Enter“"
 
 #: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Неуспех при преименуването на %s на %s"
+msgstr "Неуспех при монтиране на %s на %s"
 
 #: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -401,7 +399,7 @@ msgstr ""
 "          generate config [групи]\n"
 "          clean config\n"
 "\n"
-"apt-ftparchive генерира индексни файлове за архиви на Debian. Поддържа\n"
+"apt-ftparchive генерира индексни файлове за архиви на Дебиан. Поддържа\n"
 "много стилове на генериране от напълно автоматично до функционални\n"
 "замени на dpkg-scanpackages и dpkg-scansources.\n"
 "\n"
@@ -422,7 +420,7 @@ msgstr ""
 "Pathprefix\n"
 "се прибавя към полетата на файловите имена, ако съществува. Пример за "
 "употреба\n"
-"от архива на Debian:\n"
+"от архива на Дебиан:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages\n"
 "\n"
@@ -457,12 +455,11 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "БД е стара, опит за актуализиране на %s"
 
 #: ftparchive/cachedb.cc:72
-#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"Форматът на БД е невалиден.  Ако сте обновили от стара версия на apt, "
+"Невалиден формат на БД.  Ако сте обновили от по-стара версия на apt, "
 "премахнете базата от данни и я създайте наново."
 
 #: ftparchive/cachedb.cc:77
@@ -770,17 +767,17 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu не са напълно инсталирани или премахнати.\n"
 
 #: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
+msgstr "Избиране на %s за задача „%s“\n"
 
 #: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
+msgstr "Избиране на %s за регулярен израз „%s“\n"
 
 #: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 
@@ -794,9 +791,8 @@ msgid " [Installed]"
 msgstr " [Инсталиран]"
 
 #: cmdline/apt-get.cc:677
-#, fuzzy
 msgid " [Not candidate version]"
-msgstr "Версии кандидати"
+msgstr " [версията не е кандидат]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -818,19 +814,19 @@ msgid "However the following packages replace it:"
 msgstr "Обаче следните пакети го заместват:"
 
 #: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Пакетът %s няма кандидат за инсталиране"
+msgstr "Пакетът „%s“ няма кандидат за инсталиране"
 
 #: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Виртуални пакети като „%s“ не могат да се премахват\n"
 
 #: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Забележете, избиране на %s вместо %s\n"
+msgstr "Избиране на „%s“ вместо „%s“\n"
 
 #: cmdline/apt-get.cc:784
 #, c-format
@@ -838,9 +834,10 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
 
 #: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
+msgstr ""
+"Пропускане на %s, който не е инсталиран при заявени само обновявания.\n"
 
 #: cmdline/apt-get.cc:798
 #, c-format
@@ -1035,28 +1032,31 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
+"Следният пакет е отстранен от системата поради препокриване на всичките му "
+"файлове от други пакети:"
 msgstr[1] ""
+"Следните пакети са отстранени от системата поради препокриване на всичките "
+"им файлове от други пакети:"
 
 #: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "Това се прави автоматично от dpkg."
 
 #: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Игнориране на несъществуващо издание „%s“ на пакета „%s“"
 
 #: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
-"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+msgstr "Използване на пакет източник „%s“ вместо „%s“\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Игнориране на несъществуваща версия „%s“ на пакета „%s“"
 
 #: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
@@ -1067,26 +1067,23 @@ msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
 #: cmdline/apt-get.cc:1653
-#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-"Следните пакети са били инсталирани автоматично и вече не са необходими:"
+msgstr[0] "Следният пакет е бил инсталиран автоматично и вече не е необходим:"
 msgstr[1] ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
 #: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-"Следните пакети са били инсталирани автоматично и вече не са необходими:"
+msgstr[0] "%lu пакет е бил инсталиран автоматично и вече не е необходим:\n"
 msgstr[1] ""
-"Следните пакети са били инсталирани автоматично и вече не са необходими:"
+"%lu пакета са били инсталирани автоматично и вече не са необходими:\n"
 
 #: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
@@ -1098,7 +1095,7 @@ msgid ""
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 "Хм, изглежда AutoRemover скапа нещо, а това не би трябвало\n"
-"да се слоучва. Съобщете за грешка в пакета apt."
+"да се случва. Съобщете за грешка в пакета apt."
 
 #.
 #. if (Packages == 1)
@@ -1169,9 +1166,9 @@ msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
 #: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s е отбелязан като ръчно инсталиран.\n"
+msgstr "%s е отбелязан като автоматично инсталиран.\n"
 
 #: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
@@ -1208,6 +1205,9 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
+"Пакетирането на „%s“ се разработва в система за контрол на версиите „%s“ на "
+"адрес:\n"
+"%s\n"
 
 #: cmdline/apt-get.cc:2246
 #, c-format
@@ -1216,6 +1216,10 @@ msgid ""
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Използвайте:\n"
+"bzr get %s\n"
+"за да изтеглите последните промени в пакета (евентуално в процес на "
+"разработка).\n"
 
 #: cmdline/apt-get.cc:2297
 #, c-format
@@ -1332,7 +1336,6 @@ msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
 #: cmdline/apt-get.cc:2786
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1387,26 +1390,28 @@ msgstr ""
 "\n"
 "Команди:\n"
 "   update - Изтегляне на нови списъци с пакети\n"
-"   upgrade - Актуализиране на системата\n"
+"   upgrade - Обновяване на системата\n"
 "   install - Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)\n"
 "   remove - Премахване на пакети\n"
 "   autoremove - Автоматично премахване на неизползвани пакети\n"
 "   purge - Премахване на пакети, включително файловете им с настройки\n"
 "   source - Изтегляне на изходен код на пакети\n"
 "   build-dep - Конфигуриране на зависимостите за компилиране на пакети от\n"
-"               изходен код   dist-upgrade - Актуализиране на дистрибуцията, "
-"вж. apt-get(8)\n"
+"               изходен код\n"
+"   dist-upgrade - Обновяване на дистрибуцията, вж. apt-get(8)\n"
 "   dselect-upgrade - Следване на избора на dselect\n"
 "   clean - Изтриване на изтеглените файлове\n"
 "   autoclean - Изтриване на стари изтеглени файлове\n"
 "   check - Проверка за неудовлетворени зависимости\n"
+"   markauto - Отбелязване на дадените пакети като инсталирани автоматично\n"
+"   unmarkauto - отбелязване на дадените пакети като инсталирани ръчно\n"
 "\n"
 "Опции:\n"
 "  -h  Този помощен текст.\n"
 "  -q  Изход на съобщения, подходящи за журнал - без индикатор на напредъка\n"
 "  -qq Без извеждане на съобщения, освен при грешки\n"
-"  -d  Само изтегляне - да НЕ се инсталират или разпакетират архивите\n"
-"  -s  Без действие. Предизвикване на симулация.\n"
+"  -d  Само изтегляне - БЕЗ инсталиране или разпакетиране на архивите\n"
+"  -s  Без действие. Симулиране на действията.\n"
 "  -y  Отговаряне с „Да“ на всички въпроси, без питане\n"
 "  -f  Опит за поправяне на неудовлетворени зависимости\n"
 "  -m  Опит за продължаване дори и ако архивите са неоткриваеми\n"
@@ -1416,7 +1421,7 @@ msgstr ""
 "  -c=? Четене на този конфигурационен файл\n"
 "  -o=? Настройване на произволна конфигурационна опция,\n"
 "       напр. -o dir::cache=/tmp\n"
-"Вижте руководството на apt-get(8), sources.list(5) и apt.conf(5) за повече\n"
+"Вижте наръчниците за apt-get(8), sources.list(5) и apt.conf(5) за повече\n"
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
@@ -1427,6 +1432,10 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
+"Забележка: това е само симулация!\n"
+"           apt-get има нужда от административни права за да работи.\n"
+"           Заключването е деактивирано, така че не разчитайте\n"
+"           на повтаряемост в реална ситуация."
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
@@ -1508,18 +1517,17 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Желаете ли да изтриете изтеглените пакетни файлове?"
 
 #: dselect/install:101
-#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Възникнаха някои грешки при разпакетирането. Ще се конфигурират"
+msgstr "Възникнаха някои грешки при разпакетирането. инсталираните пакети"
 
 #: dselect/install:102
-#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "инсталираните пакети. Това може да доведе до дублирани грешки или"
+msgstr "ще бъдат конфигурирани. Това може да доведе до дублирани грешки"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "грешки, причинени от липсващи зависимости. Това е наред, само грешките"
+msgstr ""
+"или грешки, причинени от липсващи зависимости. Това е нормално, само грешките"
 
 #: dselect/install:104
 msgid ""
@@ -1561,9 +1569,9 @@ msgid "Error reading archive member header"
 msgstr "Грешка при четене на заглавната част на елемента на архива"
 
 #: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid archive member header %s"
-msgstr "Невалидна заглавна част на елемента на архива"
+msgstr "Невалидна заглавна част %s на елемента на архива"
 
 #: apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
@@ -1938,7 +1946,7 @@ msgstr "Неуспех при създаването на гнездо"
 #: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
-"Неуспех при свързването на гнездо за данни, допустимото време за свъзрзване "
+"Неуспех при свързването на гнездо за данни, допустимото време за свързване "
 "изтече"
 
 #: methods/ftp.cc:709
@@ -2058,20 +2066,20 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Временен неуспех при намирането на IP адреса на „%s“"
 
 #: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)"
+msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
 
 #: methods/connect.cc:243
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Неуспех при свързването с %s %s:"
+msgstr "Неуспех при свързване с %s:%s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
 msgid "No keyring installed in %s."
-msgstr "Прекъсване на инсталирането."
+msgstr "В %s няма инсталиран ключодържател."
 
 #: methods/gpgv.cc:163
 msgid ""
@@ -2085,10 +2093,9 @@ msgid "At least one invalid signature was encountered."
 msgstr "Намерен е поне един невалиден подпис."
 
 #: methods/gpgv.cc:172
-#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е "
+"Неуспех при изпълнение на „gpgv“ за проверка на подписа (инсталиран ли е "
 "gpgv?)"
 
 #: methods/gpgv.cc:177
@@ -2189,9 +2196,9 @@ msgid "Can't mmap an empty file"
 msgstr "Невъзможно е да се прехвърли в паметта празен файл"
 
 #: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Неуспех при отварянето на програмен канал за %s"
+msgstr "Неуспех при дублиране на файлов манипулатор %i"
 
 #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
@@ -2199,14 +2206,12 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
 
 #: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
 msgid "Unable to close mmap"
-msgstr "Неуспех при отварянето на %s"
+msgstr "Неуспех при затваряне на mmap"
 
 #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "Неуспех при извикването на "
+msgstr "Неуспех при синхронизирането на mmap"
 
 #: apt-pkg/contrib/mmap.cc:300
 #, c-format
@@ -2214,6 +2219,8 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
+"Недостатъчна памет за MMap. Увеличете стойността на променливата APT::Cache-"
+"Limit. Текуща стойност: %lu (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:399
 #, c-format
@@ -2221,35 +2228,39 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
+"Неуспех при увеличаване на паметта за MMap. Достигнато е текущото "
+"ограничение от %lu байта."
 
 #: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
+"Неуспех при увеличаване на паметта за MMap. Автоматичното увеличаване е "
+"забранено от потребителя."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%liд %liч %liм %liс"
 
 #. h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%liч %liм %liс"
 
 #. min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%limin %lis"
-msgstr ""
+msgstr "%liм %liс"
 
 #. s means seconds
 #: apt-pkg/contrib/strutl.cc:390
 #, c-format
 msgid "%lis"
-msgstr ""
+msgstr "%liс"
 
 #: apt-pkg/contrib/strutl.cc:1119
 #, c-format
@@ -2304,11 +2315,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“"
 
 #: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното "
-"ниво"
+"Синтактична грешка %s:%u: директивата clear изисква  аргумент дърво от опции"
 
 #: apt-pkg/contrib/configuration.cc:827
 #, c-format
@@ -2420,9 +2430,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
 
 #: apt-pkg/contrib/fileutl.cc:635
-#, fuzzy, c-format
+#, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s."
+msgstr "Под-процесът %s получи сигнал %u."
 
 #: apt-pkg/contrib/fileutl.cc:639
 #, c-format
@@ -2440,9 +2450,9 @@ msgid "Could not open file %s"
 msgstr "Неуспех при отварянето на файла %s"
 
 #: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Неуспех при отварянето на програмен канал за %s"
+msgstr "Неуспех при отварянето на файлов манипулатор %d"
 
 #: apt-pkg/contrib/fileutl.cc:774
 #, c-format
@@ -2456,24 +2466,24 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "грешка при запис, все още име %lu за запис, но не успя"
 
 #: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Проблем при затварянето на файла"
+msgstr "Проблем при затваряне на компресираният файл %s (gzip)"
 
 #: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the file %s"
-msgstr "Проблем при затварянето на файла"
+msgstr "Проблем при затваряне на файла %s"
 
 #: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Проблем при синхронизиране на файла"
+msgstr "Проблем при преименуване на файла %s на %s"
 
 #: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Проблем при премахването на връзка към файла"
+msgstr "Проблем при изтриване на файла %s"
 
 #: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
@@ -2518,7 +2528,7 @@ msgstr "Препоръчва се"
 
 #: apt-pkg/pkgcache.cc:291
 msgid "Conflicts"
-msgstr "Конфликтира с"
+msgstr "В конфликт с"
 
 #: apt-pkg/pkgcache.cc:291
 msgid "Replaces"
@@ -2534,7 +2544,7 @@ msgstr "Чупи"
 
 #: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
-msgstr ""
+msgstr "Подобрява"
 
 #: apt-pkg/pkgcache.cc:303
 msgid "important"
@@ -2586,6 +2596,7 @@ msgstr "Неуспех при запис на временен StateFile %s"
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
+"Вътрешна грешка, групата „%s“ няма псевдо-пакет, подходящ за инсталиране"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2598,33 +2609,34 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Неуспех при анализирането на пакетен файл %s (2)"
 
 #: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+"Лошо форматиран ред %lu в списъка с източници %s (неразбираема [опция])"
 
 #: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)"
+msgstr ""
+"Лошо форматиран ред %lu в списъка с източници %s (твърде кратка [опция])"
 
 #: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] не е присвояване)"
 
 #: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+msgstr "Лошо форматиран ред %lu в списъка с източници %s (липсва ключ в [%s])"
 
 #: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
-"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)"
+"Лошо форматиран ред %lu в списъка с източници %s ([%s] ключът %s няма "
+"стойност)"
 
 #: apt-pkg/sourcelist.cc:128
 #, c-format
@@ -2679,6 +2691,8 @@ msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
+"Неуспех при незабавната настройка на „%s“. За повече информация вижте "
+"информацията за APT::Immediate-Configure в „man 5 apt.conf“. (%d)"
 
 #: apt-pkg/packagemanager.cc:452
 #, c-format
@@ -2687,7 +2701,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 ""
-"В следствие на циклични зависимости от типа „Конфликтира/Предварително "
+"В следствие на циклични зависимости от типа „В конфликт с/Предварително "
 "зависи от“, за да се продължи инсталацията трябва да се премахне необходимия "
 "пакет %s. Това често е лошо, но ако наистина искате да го направите, "
 "активирайте опцията APT::Force-LoopBreak."
@@ -2698,6 +2712,8 @@ msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""
+"Неуспех при незабавна настройка на разпакетиран „%s“. За повече информация "
+"прочетете за APT::Immediate-Configure в „man 5 apt.conf“."
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
@@ -2734,19 +2750,19 @@ msgstr ""
 "са използвани по-стари."
 
 #: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
 msgid "List directory %spartial is missing."
 msgstr "Директорията със списъци %spartial липсва."
 
 #: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
 msgid "Archives directory %spartial is missing."
 msgstr "Директорията за архиви %spartial липсва."
 
 #: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock directory %s"
-msgstr "Неуспех при заключването на директорията със списъка на пакетите"
+msgstr "Неуспех при заключване на директорията %s"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2805,9 +2821,9 @@ msgstr ""
 "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми"
 
 #: apt-pkg/policy.cc:343
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Невалиден запис във файла с настройки, няма заглавна част Package"
+msgstr "Невалиден запис във файла с настройки %s, липсва заглавна част Package"
 
 #: apt-pkg/policy.cc:365
 #, c-format
@@ -2849,9 +2865,9 @@ msgstr "Възникна грешка при обработката на %s (New
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Възникна грешка при обработката на %s (NewVersion1)"
+msgstr "Грешка при обработка на %s (NewVersion%d)"
 
 #: apt-pkg/pkgcachegen.cc:320
 #, c-format
@@ -2936,12 +2952,12 @@ msgstr "Няма налични публични ключове за следн�
 #: apt-pkg/acquire-item.cc:1277
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgstr "Файлът %s вече не е валиден и ще бъде игнориран. (изтекъл е преди %s)"
 
 #: apt-pkg/acquire-item.cc:1298
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
 
 #: apt-pkg/acquire-item.cc:1324
 #, c-format
@@ -2949,11 +2965,13 @@ msgid ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used.GPG error: %s: %s\n"
 msgstr ""
+"Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се "
+"използват старите индексни файлове. Грешка от GPG: %s: %s\n"
 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "Грешка от GPG: %s: %s"
 
 #: apt-pkg/acquire-item.cc:1361
 #, c-format
@@ -2985,29 +3003,29 @@ msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
 #: apt-pkg/indexrecords.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Неуспех при анализирането на пакетен файл %s (1)"
+msgstr "Неуспех при анализиране на файл Release %s"
 
 #: apt-pkg/indexrecords.cc:60
-#, fuzzy, c-format
+#, c-format
 msgid "No sections in Release file %s"
-msgstr "Забележете, избиране на %s вместо %s\n"
+msgstr "Във файла Release %s липсват раздели"
 
 #: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Във файла Release %s липсва контролна сума"
 
 #: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Неправилен ред във файла с отклонения: %s"
+msgstr "Неправилна стойност за „Valid-Until“ във файла Release %s"
 
 #: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Неуспех при анализирането на пакетен файл %s (1)"
+msgstr "Неправилна стойност за „Date“ във файла Release %s"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
@@ -3072,6 +3090,8 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
+"Не са намерени файлове с пакети. Мое би дискът не е с Дебиан или е за "
+"погрешна компютърна архитектура."
 
 #: apt-pkg/cdrom.cc:703
 #, c-format
@@ -3124,19 +3144,19 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n"
 
 #: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping nonexistent file %s"
-msgstr "Отваряне на конфигурационен файл %s"
+msgstr "Пропускане на несъществуващ файл %s"
 
 #: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Не е намерен oторизационен запис за: %s"
 
 #: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Несъответствие на контролната сума"
+msgstr "Несъответствие на контролната сума за: %s"
 
 #: apt-pkg/cacheset.cc:337
 #, c-format
@@ -3149,19 +3169,19 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Не е намерена версия „%s“ на „%s“"
 
 #: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task '%s'"
-msgstr "Неуспех при намирането на задача %s"
+msgstr "Неуспех при намиране на задача „%s“"
 
 #: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "Неуспех при намирането на пакет %s"
+msgstr "Не са намерен пакети, отговарящ на регулярния израз „%s“"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
+msgstr "Не е възможно избиране на версия за пакета „%s“ понеже е виртуален"
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
 #, c-format
@@ -3169,21 +3189,29 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
+"Не е възможно избиране на инсталирана или кандидат версия за пакета „%s“ "
+"понеже той няма нито едната"
 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
+"Не е възможно избиране на на последната версия за пакета „%s“, защото е "
+"виртуален"
 
 #: apt-pkg/cacheset.cc:499
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
+"Не е възможно избиране на кандидат-версия за пакета „%s“, защото няма "
+"подходящ кандидати"
 
 #: apt-pkg/cacheset.cc:507
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
+"Не е възможно избиране на инсталирана версия на пакета „%s“, защото не е "
+"инсталиран"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
@@ -3201,14 +3229,14 @@ msgid "Removing %s"
 msgstr "Премахване на %s"
 
 #: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
 msgid "Completely removing %s"
-msgstr "%s е напълно премахнат"
+msgstr "Окончателно премахване на %s"
 
 #: apt-pkg/deb/dpkgpm.cc:56
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Отбелязване на изчезването на %s"
 
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
@@ -3221,9 +3249,9 @@ msgid "Directory '%s' missing"
 msgstr "Директорията „%s“ липсва"
 
 #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file '%s'"
-msgstr "Неуспех при отварянето на файла %s"
+msgstr "Неуспех при отваряне на файла „%s“"
 
 #: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
@@ -3273,39 +3301,48 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
-msgstr ""
+msgstr "Изпълняване на dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
+"Поради достигане на максималния брой доклади (MaxReports) не е записан нов "
+"доклад за зависимостите."
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "отлагане на настройката поради неудовлетворени зависимости"
 
 #: apt-pkg/deb/dpkgpm.cc:1280
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
+"Доклад за зависимостите не е записан защото съобщението за грешка е породено "
+"от друга грешка."
 
 #: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
+"Доклад за зависимостите не е записан защото грешката е причинена от "
+"недостатъчно дисково пространство"
 
 #: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
+"Доклад за зависимостите не е записан защото грешката е причинена от "
+"недостатъчна оперативна памет"
 
 #: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
+"Доклад за зависимостите не е записан поради входно-изходна грешка с dpkg"
 
 #: apt-pkg/deb/debsystem.cc:69
 #, c-format
@@ -3313,11 +3350,15 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
+"Неуспех при заключване на административната директория (%s). Може би се "
+"използва от друг процес?"
 
 #: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Неуспех при заключването на директорията със списъка на пакетите"
+msgstr ""
+"Неуспех при заключване на административната директория (%s). Може би липсват "
+"административни права?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3326,22 +3367,24 @@ msgstr "Неуспех при заключването на директория
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
+"Процесът dpkg е беше прекъснат. Проблемът трябва да се коригира чрез ръчно "
+"изпълнение на „%s“."
 
 #: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
-msgstr ""
+msgstr "Без заключване"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:200
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Файлът „%s“ на огледалния сървър не е намерен "
 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Огледален сървър: %s]"
 
 #: methods/rred.cc:465
 #, c-format
@@ -3349,6 +3392,8 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
+"Неуспех при закърпване на %s с mmap и операции с файл – кръпката изглежда "
+"повредена."
 
 #: methods/rred.cc:470
 #, c-format
@@ -3356,6 +3401,8 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
+"Неуспех при закърпване на %s с mmap (без грешка, специфична за mmap) – "
+"кръпката изглежда повредена."
 
 #: methods/rsh.cc:329
 msgid "Connection closed prematurely"
diff --git a/po/it.po b/po/it.po
index c7f566cd5..dd92b7a67 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2010-08-24 20:43+0200\n"
+"PO-Revision-Date: 2010-08-27 20:57+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -632,7 +632,7 @@ msgstr "Creazione di un sottoprocesso IPC non riuscita"
 
 #: ftparchive/multicompress.cc:321
 msgid "Failed to exec compressor "
-msgstr "Esecuzione di compressor non riuscita"
+msgstr "Esecuzione non riuscita del compressore "
 
 #: ftparchive/multicompress.cc:360
 msgid "decompressor"
@@ -672,12 +672,12 @@ msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:"
 #: cmdline/apt-get.cc:341
 #, c-format
 msgid "but %s is installed"
-msgstr "ma %s è installato"
+msgstr "ma la versione %s è installata"
 
 #: cmdline/apt-get.cc:343
 #, c-format
 msgid "but %s is to be installed"
-msgstr "ma %s sta per essere installato"
+msgstr "ma la versione %s sta per essere installata"
 
 #: cmdline/apt-get.cc:350
 msgid "but it is not installable"
@@ -763,12 +763,12 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non completamente installati o rimossi.\n"
 
 #: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per il task \"%s\"\n"
 
 #: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" per l'espressione regolare \"%s\"\n"
 
@@ -810,17 +810,17 @@ msgid "However the following packages replace it:"
 msgstr "Tuttavia questi pacchetti lo sostituiscono:"
 
 #: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Il pacchetto %s non ha candidati da installare"
+msgstr "Il pacchetto \"%s\" non ha candidati da installare"
 
 #: cmdline/apt-get.cc:723
-#, fuzzy, c-format
+#, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi"
+msgstr "Pacchetti virtuali come \"%s\" non possono essere rimossi\n"
 
 #: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Nota, viene selezionato \"%s\" al posto di \"%s\"\n"
 
@@ -1073,7 +1073,7 @@ msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] ""
-"Il seguente pacchette è stato installato automaticamente e non è più "
+"Il seguente pacchetto è stato installato automaticamente e non è più "
 "richiesto:"
 msgstr[1] ""
 "I seguenti pacchetti sono stati installati automaticamente e non sono più "
@@ -1114,7 +1114,7 @@ msgstr ""
 #.
 #: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
-msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione: "
+msgstr "Le seguenti informazioni possono aiutare a risolvere la situazione:"
 
 #: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
@@ -1151,7 +1151,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:1812
 msgid "Broken packages"
-msgstr "Pacchetto danneggiato"
+msgstr "Pacchetti danneggiati"
 
 #: cmdline/apt-get.cc:1841
 msgid "The following extra packages will be installed:"
@@ -1399,7 +1399,7 @@ msgstr ""
 "   autoremove - Rimuove automaticamente i pacchetti inutilizzati\n"
 "   purge - Rimuove i pacchetti e la loro configurazione\n"
 "   source - Scarica i pacchetti sorgente\n"
-"   build-dep - Configura le dipendenze di compilazione per i pacchetti "
+"   build-dep - Configura le dipendenze di generazione per i pacchetti "
 "sorgente\n"
 "   dist-upgrade - Esegue un avanzamento della distribuzione, consultare apt-"
 "get(8)\n"
@@ -1420,7 +1420,7 @@ msgstr ""
 "conferma\n"
 "  -f  Tenta di continuare se il controllo di integrità non riesce\n"
 "  -m  Tenta di continuare se gli archivi non sono localizzabili\n"
-"  -u  Mostra un elenco dei pacchetti aggiornati\n"
+"  -u  Mostra anche un elenco dei pacchetti aggiornati\n"
 "  -b  Genera il pacchetto sorgente dopo averlo recuperato\n"
 "  -V  Mostra prolissamente i numeri di versione\n"
 "  -c=? Legge come configurazione il file specificato\n"
@@ -1477,7 +1477,7 @@ msgid ""
 msgstr ""
 "Cambio disco: inserire il disco chiamato\n"
 " \"%s\"\n"
-"nel dispositivo \"%s\" e premere Invio\n"
+"nell'unità \"%s\" e premere Invio\n"
 
 #: cmdline/apt-sortpkgs.cc:86
 msgid "Unknown package record!"
@@ -1765,7 +1765,7 @@ msgstr "Apertura del file di deviazione %sdiversions non riuscita"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
-msgstr "Il file di diversion è danneggiato"
+msgstr "Il file di deviazione è danneggiato"
 
 #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
 #: apt-inst/deb/dpkgdb.cc:337
@@ -1956,11 +1956,12 @@ msgstr "Impossibile creare un socket"
 
 #: methods/ftp.cc:703
 msgid "Could not connect data socket, connection timed out"
-msgstr "Impossibile connettersi al socket dati, connessione terminata"
+msgstr ""
+"Impossibile connettersi al socket dati, tempo esaurito per la connessione"
 
 #: methods/ftp.cc:709
 msgid "Could not connect passive socket."
-msgstr "Impossibile connettere socket passivo."
+msgstr "Impossibile connettersi alla socket passiva."
 
 #: methods/ftp.cc:727
 msgid "getaddrinfo was unable to get a listening socket"
@@ -2243,7 +2244,6 @@ msgstr ""
 
 # (ndt) lunghetta...
 #: apt-pkg/contrib/mmap.cc:402
-#, fuzzy
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2464,7 +2464,7 @@ msgid "Could not open file %s"
 msgstr "Impossibile aprire il file %s"
 
 #: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Impossibile aprire il descrittore del file %d"
 
@@ -2479,22 +2479,22 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "scrittura, c'erano ancora %lu da scrivere ma non è stato possibile"
 
 #: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Si è verificato un problema nel chiudere il file gzip %s"
 
 #: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the file %s"
 msgstr "Si è verificato un problema nel chiudere il file %s"
 
 #: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Si è verificato un problema nel rinominare il file %s in %s"
 
 #: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Si è verificato un problema nell'eseguire l'unlink del file %s"
 
@@ -2768,7 +2768,6 @@ msgstr ""
 "Impossibile scaricare alcuni file di indice: saranno ignorati o verranno "
 "usati quelli vecchi."
 
-# (ndt) sarebbe da controllare meglio assieme a quella dopo
 #: apt-pkg/acquire.cc:79
 #, c-format
 msgid "List directory %spartial is missing."
@@ -2887,7 +2886,7 @@ msgstr "Si è verificato un errore nell'elaborare %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion%d)"
 msgstr "Si è verificato un errore nell'elaborare %s (NewVersion%d)"
 
@@ -2989,7 +2988,7 @@ msgid ""
 "updated and the previous index files will be used.GPG error: %s: %s\n"
 msgstr ""
 "Si è verificato un errore nel verificare la firma. Il repository non è "
-"aggiornato e verrà usato il file precedente. Errore GPG: %s: %s\n"
+"aggiornato e verranno usati i file indice precedenti. Errore GPG: %s: %s\n"
 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
@@ -3014,13 +3013,14 @@ msgstr ""
 "Impossibile trovare un file per il pacchetto %s. Potrebbe essere necessario "
 "sistemare manualmente questo pacchetto."
 
+# (ndt) sarebbe da controllare se veramente possono esistere più file indice
 #: apt-pkg/acquire-item.cc:1475
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
-"L'indice dei file è danneggiato. Manca il campo \"Filename:\" per il "
-"pacchetto %s."
+"I file indice del pacchetto sono danneggiati. Manca il campo \"Filename:\" "
+"per il pacchetto %s."
 
 #: apt-pkg/acquire-item.cc:1562
 msgid "Size mismatch"
@@ -3196,12 +3196,12 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Version \"%s\" per \"%s\" non trovato"
 
 #: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Impossibile trovare il task \"%s\""
 
 #: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 "Impossibile trovare alcun pacchetto tramite l'espressione regolare \"%s\""
diff --git a/po/ko.po b/po/ko.po
index 176598f70..9f69dc381 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,18 +1,19 @@
 # Sunjae Park <darehanl@gmail.com>, 2006-2007, 2008.
-# Changwoo Ryu <cwryu@debian.org>, 2004-2005, 2008.
+# Changwoo Ryu <cwryu@debian.org>, 2004-2005, 2008, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2008-11-13 07:14+0900\n"
+"PO-Revision-Date: 2010-08-30 02:31+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: cmdline/apt-cache.cc:156
 #, c-format
@@ -24,9 +25,8 @@ msgid "Total package names: "
 msgstr "전체 패키지 이름 : "
 
 #: cmdline/apt-cache.cc:286
-#, fuzzy
 msgid "Total package structures: "
-msgstr "전체 패키지 이름 : "
+msgstr "전체 패키지 구조: "
 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
@@ -94,9 +94,8 @@ msgid "Package file %s is out of sync."
 msgstr "패키지 파일 %s 파일이 동기화되지 않았습니다."
 
 #: cmdline/apt-cache.cc:1273
-#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "정확히 한 개의 패턴을 넘겨야 합니다"
+msgstr "최소 한 개의 검색어를 지정해야 합니다"
 
 #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 #: cmdline/apt-cache.cc:1508
@@ -154,7 +153,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s(%s), 컴파일 시각 %s %s\n"
 
 #: cmdline/apt-cache.cc:1739
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -212,6 +210,7 @@ msgstr ""
 "   unmet - 맞지 않는 의존성을 봅니다\n"
 "   search - 정규식 패턴에 맞는 패키지 목록을 찾습니다\n"
 "   show - 패키지에 대해 읽을 수 있는 기록을 봅니다\n"
+"   showauto - 자동으로 설치한 패키지 목록을 표시합니다\n"
 "   depends - 패키지에 대해 의존성 정보를 그대로 봅니다\n"
 "   rdepends - 패키지의 역 의존성 정보를 봅니다\n"
 "   pkgnames - 시스템에 들어 있는 패키지의 이름을 모두 봅니다\n"
@@ -230,18 +229,17 @@ msgstr ""
 "좀 더 자세한 정보는 apt-cache(8) 및 apt.conf(5) 매뉴얼 페이지를 보십시오.\n"
 
 #: cmdline/apt-cdrom.cc:77
-#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "이 디스크를 위해 'Debian 2.1r1 Disk 1'와 같은 이름을 지정하십시오"
+msgstr "이 디스크의 이름을 정하십시오 (예: 'Debian 5.0.3 Disk 1')"
 
 #: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "드라이브에 디스크를 넣고 Enter를 누르십시오"
 
 #: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
+msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 
 #: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -299,7 +297,7 @@ msgid ""
 msgstr ""
 "사용법: apt-extracttemplates 파일1 [파일2 ...]\n"
 "\n"
-"apt-extracttemplates는 데비안 패키지에서 설정 및 템플릿 정보를 뽑아내는\n"
+"apt-extracttemplates는 데비안 패키지에서 설정 및 서식 정보를 뽑아내는\n"
 "도구입니다\n"
 "\n"
 "옵션:\n"
@@ -326,7 +324,7 @@ msgstr "패키지 확장 목록이 너무 깁니다"
 #: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
 #, c-format
 msgid "Error processing directory %s"
-msgstr "%s 디렉토리를 처리하는 데 오류가 발생했습니다"
+msgstr "%s 디렉터리를 처리하는데 오류가 발생했습니다"
 
 #: ftparchive/apt-ftparchive.cc:258
 msgid "Source extension list is too long"
@@ -334,12 +332,12 @@ msgstr "소스 확장 목록이 너무 깁니다"
 
 #: ftparchive/apt-ftparchive.cc:375
 msgid "Error writing header to contents file"
-msgstr "컨텐츠 파일에 헤더를 쓰는 데 오류가 발생했습니다"
+msgstr "컨텐츠 파일에 헤더를 쓰는데 오류가 발생했습니다"
 
 #: ftparchive/apt-ftparchive.cc:405
 #, c-format
 msgid "Error processing contents %s"
-msgstr "%s 컨텐츠를 처리하는 데 오류가 발생했습니다"
+msgstr "%s 컨텐츠를 처리하는데 오류가 발생했습니다"
 
 #: ftparchive/apt-ftparchive.cc:590
 msgid ""
@@ -442,12 +440,11 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다"
 
 #: ftparchive/cachedb.cc:72
-#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 "
+"DB 형식이 잘못되었습니다. APT 예전 버전에서 업그레이드했다면, 데이터베이스를 "
 "지우고 다시 만드십시오."
 
 #: ftparchive/cachedb.cc:77
@@ -459,7 +456,7 @@ msgstr "DB 파일, %s 파일을 열 수 없습니다: %s"
 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
 #, c-format
 msgid "Failed to stat %s"
-msgstr "%s의 정보를 읽는 데 실패했습니다"
+msgstr "%s의 정보를 읽는데 실패했습니다"
 
 #: ftparchive/cachedb.cc:242
 msgid "Archive has no control record"
@@ -473,7 +470,7 @@ msgstr "커서를 가져올 수 없습니다"
 #: ftparchive/writer.cc:73
 #, c-format
 msgid "W: Unable to read directory %s\n"
-msgstr "경고: %s 디렉토리를 읽을 수 없습니다\n"
+msgstr "경고: %s 디렉터리를 읽을 수 없습니다\n"
 
 #: ftparchive/writer.cc:78
 #, c-format
@@ -490,12 +487,12 @@ msgstr "경고: "
 
 #: ftparchive/writer.cc:143
 msgid "E: Errors apply to file "
-msgstr "오류: 다음 파일에 적용하는 데 오류가 발생했습니다: "
+msgstr "오류: 다음 파일에 적용하는데 오류가 발생했습니다: "
 
 #: ftparchive/writer.cc:161 ftparchive/writer.cc:193
 #, c-format
 msgid "Failed to resolve %s"
-msgstr "%s의 경로를 알아내는 데 실패했습니다"
+msgstr "%s의 경로를 알아내는데 실패했습니다"
 
 #: ftparchive/writer.cc:174
 msgid "Tree walking failed"
@@ -504,7 +501,7 @@ msgstr "트리에서 이동이 실패했습니다"
 #: ftparchive/writer.cc:201
 #, c-format
 msgid "Failed to open %s"
-msgstr "%s 파일을 여는 데 실패했습니다"
+msgstr "%s 파일을 여는데 실패했습니다"
 
 # FIXME: ??
 #: ftparchive/writer.cc:260
@@ -515,17 +512,17 @@ msgstr " 링크 %s [%s] 없애기\n"
 #: ftparchive/writer.cc:268
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "%s 파일에 readlink하는 데 실패했습니다"
+msgstr "%s 파일에 readlink하는데 실패했습니다"
 
 #: ftparchive/writer.cc:272
 #, c-format
 msgid "Failed to unlink %s"
-msgstr "%s 파일을 지우는 데 실패했습니다"
+msgstr "%s 파일을 지우는데 실패했습니다"
 
 #: ftparchive/writer.cc:279
 #, c-format
 msgid "*** Failed to link %s to %s"
-msgstr "*** %s 파일을 %s에 링크하는 데 실패했습니다"
+msgstr "*** %s 파일을 %s에 링크하는데 실패했습니다"
 
 #: ftparchive/writer.cc:289
 #, c-format
@@ -563,7 +560,7 @@ msgstr "내부 오류, %s 멤버를 찾을 수 없습니다"
 
 #: ftparchive/contents.cc:358 ftparchive/contents.cc:389
 msgid "realloc - Failed to allocate memory"
-msgstr "realloc - 메모리를 할당하는 데 실패했습니다"
+msgstr "realloc - 메모리를 할당하는데 실패했습니다"
 
 #: ftparchive/override.cc:34 ftparchive/override.cc:142
 #, c-format
@@ -588,7 +585,7 @@ msgstr "override %s의 %lu번 줄 #3이 잘못되었습니다"
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
 msgid "Failed to read the override file %s"
-msgstr "%s override 파일을 읽는 데 실패했습니다"
+msgstr "%s override 파일을 읽는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:72
 #, c-format
@@ -602,15 +599,15 @@ msgstr "압축된 출력물 %s에는 압축 세트가 필요합니다"
 
 #: ftparchive/multicompress.cc:169 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
-msgstr "하위 프로세스에 대한 IPC 파이프를 만드는 데 실패했습니다"
+msgstr "하위 프로세스에 대한 IPC 파이프를 만드는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:195
 msgid "Failed to create FILE*"
-msgstr "FILE*를 만드는 데 실패했습니다"
+msgstr "FILE*를 만드는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:198
 msgid "Failed to fork"
-msgstr "fork하는 데 실패했습니다"
+msgstr "fork하는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:212
 msgid "Compress child"
@@ -619,15 +616,15 @@ msgstr "압축 하위 프로세스"
 #: ftparchive/multicompress.cc:235
 #, c-format
 msgid "Internal error, failed to create %s"
-msgstr "내부 오류, %s 만드는 데 실패했습니다"
+msgstr "내부 오류, %s 만드는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:286
 msgid "Failed to create subprocess IPC"
-msgstr "하위 프로세스 IPC를 만드는 데 실패했습니다"
+msgstr "하위 프로세스 IPC를 만드는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:321
 msgid "Failed to exec compressor "
-msgstr "다음 압축 프로그램을 실행하는 데 실패했습니다: "
+msgstr "다음 압축 프로그램을 실행하는데 실패했습니다: "
 
 #: ftparchive/multicompress.cc:360
 msgid "decompressor"
@@ -635,21 +632,21 @@ msgstr "압축 해제 프로그램"
 
 #: ftparchive/multicompress.cc:403
 msgid "IO to subprocess/file failed"
-msgstr "하위 프로세스/파일에 입출력하는 데 실패했습니다"
+msgstr "하위 프로세스/파일에 입출력하는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:455
 msgid "Failed to read while computing MD5"
-msgstr "MD5를 계산하는 동안 읽는 데 실패했습니다"
+msgstr "MD5를 계산하는 동안 읽는데 실패했습니다"
 
 #: ftparchive/multicompress.cc:472
 #, c-format
 msgid "Problem unlinking %s"
-msgstr "%s의 링크를 해제하는 데 문제가 있습니다"
+msgstr "%s의 링크를 해제하는데 문제가 있습니다"
 
 #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
 #, c-format
 msgid "Failed to rename %s to %s"
-msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다"
+msgstr "%s 파일의 이름을 %s(으)로 바꾸는데 실패했습니다"
 
 #: cmdline/apt-get.cc:134
 msgid "Y"
@@ -749,7 +746,7 @@ msgstr "%lu개 업그레이드, "
 #: cmdline/apt-get.cc:610
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu개 지우기 및 %lu개 업그레이드 안 함.\n"
+msgstr "%lu개 제거 및 %lu개 업그레이드 안 함.\n"
 
 #: cmdline/apt-get.cc:614
 #, c-format
@@ -757,33 +754,32 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu개를 완전히 설치하지 못했거나 지움.\n"
 
 #: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
+msgstr "주의, 작업 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n"
 
 #: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n"
+msgstr "주의, 정규식 '%2$s'에 대해 '%1$s'을(를) 선택합니다\n"
 
 #: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n"
+msgstr "'%3$s' 패키지의 '%1$s' (%2$s) 버전을 선택합니다\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
-msgstr "%s 패키지는 다음 패키지가 제공하는 가상 패키지입니다:\n"
+msgstr "%s 패키지는 다음이 제공하는 가상 패키지입니다:\n"
 
 #: cmdline/apt-get.cc:668
 msgid " [Installed]"
 msgstr " [설치함]"
 
 #: cmdline/apt-get.cc:677
-#, fuzzy
 msgid " [Not candidate version]"
-msgstr "후보 버전"
+msgstr "[후보 버전 아님]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -805,19 +801,19 @@ msgid "However the following packages replace it:"
 msgstr "하지만 다음 패키지가 대체합니다:"
 
 #: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "%s 패키지는 설치할 수 있는 후보가 없습니다"
+msgstr "'%s' 패키지는 설치할 수 있는 후보가 없습니다"
 
 #: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "'%s' 패키지와 같은 가상 패키지는 제거할 수 없습니다\n"
 
 #: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
+msgstr "주의, '%2$s' 대신에 '%1$s' 패키지를 선택합니다\n"
 
 #: cmdline/apt-get.cc:784
 #, c-format
@@ -826,10 +822,9 @@ msgstr ""
 "%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
 
 #: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"%s 패키지를 건너 뜁니다. 이미 설치되어 있고 업그레이드를 하지 않습니다.\n"
+msgstr "%s 패키지를 건너 뜁니다. 설치되지 않았고 업그레이드만 요청합니다.\n"
 
 #: cmdline/apt-get.cc:798
 #, c-format
@@ -906,7 +901,7 @@ msgstr "내부 오류. 망가진 패키지에서 InstallPackages를 호출했습
 
 #: cmdline/apt-get.cc:1049
 msgid "Packages need to be removed but remove is disabled."
-msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다."
+msgstr "패키지를 제거해야 하지만 제거가 금지되어 있습니다."
 
 #: cmdline/apt-get.cc:1060
 msgid "Internal error, Ordering didn't finish"
@@ -987,11 +982,11 @@ msgstr "계속 하시겠습니까 [Y/n]? "
 #: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
 #, c-format
 msgid "Failed to fetch %s  %s\n"
-msgstr "%s 파일을 받는 데 실패했습니다  %s\n"
+msgstr "%s 파일을 받는데 실패했습니다  %s\n"
 
 #: cmdline/apt-get.cc:1275
 msgid "Some files failed to download"
-msgstr "일부 파일을 받는 데 실패했습니다"
+msgstr "일부 파일을 받는데 실패했습니다"
 
 #: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
 msgid "Download complete and in download only mode"
@@ -1025,27 +1020,28 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
-msgstr[1] ""
+"다음 패키지는 패키지의 파일을 모두 다른 패키지가\n"
+"덮어썼기 때문에 사라졌습니다:"
 
 #: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "주의: dpkg에서 자동으로 의도적으로 수행했습니다."
 
 #: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "'%2$s' 패키지의 '%1$s' 대상 릴리스는 없으므로 무시합니다."
 
 #: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다"
+msgstr "소스 패키지로 '%s'을(를) '%s' 대신 선택합니다\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "'%2$s' 패키지의 '%1$s' 버전은 없으므로 무시합니다."
 
 #: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
@@ -1056,30 +1052,23 @@ msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다"
 
 #: cmdline/apt-get.cc:1653
-#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
-msgstr[0] ""
-"다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-msgstr[1] ""
-"다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
+msgstr[0] "다음 패키지가 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
 
 #: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-"다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
-msgstr[1] ""
-"다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:"
+msgstr[0] "패키지 %lu개가 자동으로 설치되었지만 더 이상 필요하지 않습니다.\n"
 
 #: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
-msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오."
+msgstr "이들을 지우려면 'apt-get autoremove'를 사용하십시오."
 
 #: cmdline/apt-get.cc:1664
 msgid ""
@@ -1101,7 +1090,7 @@ msgstr ""
 #.
 #: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
 msgid "The following information may help to resolve the situation:"
-msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:"
+msgstr "이 상황을 해결하는데 다음 정보가 도움이 될 수도 있습니다:"
 
 #: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
@@ -1157,9 +1146,9 @@ msgid "Couldn't find package %s"
 msgstr "%s 패키지를 찾을 수 없습니다"
 
 #: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s 패키지 수동설치로 지정합니다.\n"
+msgstr "%s 패키지는 수동설치로 지정합니다.\n"
 
 #: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
@@ -1179,7 +1168,7 @@ msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸�
 
 #: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
 msgid "Unable to lock the download directory"
-msgstr "다운로드 디렉토리를 잠글 수 없습니다"
+msgstr "다운로드 디렉터리를 잠글 수 없습니다"
 
 #: cmdline/apt-get.cc:2185
 msgid "Must specify at least one package to fetch source for"
@@ -1196,6 +1185,8 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
+"알림: '%s' 패키징은 다음 '%s' 버전 컨트롤 시스템에서 관리합니다:\n"
+"%s\n"
 
 #: cmdline/apt-get.cc:2246
 #, c-format
@@ -1204,6 +1195,9 @@ msgid ""
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"패키지의 최근 (아마도 릴리스되지 않은) 업데이트를 받으려면\n"
+"다음과 같이 하십시오:\n"
+"bzr get %s\n"
 
 #: cmdline/apt-get.cc:2297
 #, c-format
@@ -1232,7 +1226,7 @@ msgstr "%s 소스를 가져옵니다\n"
 
 #: cmdline/apt-get.cc:2380
 msgid "Failed to fetch some archives."
-msgstr "일부 아카이브를 가져오는 데 실패했습니다."
+msgstr "일부 아카이브를 가져오는데 실패했습니다."
 
 #: cmdline/apt-get.cc:2410
 #, c-format
@@ -1294,13 +1288,13 @@ msgstr ""
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
-"%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: 설치한 %3$s 패키지가 너"
+"%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: 설치한 %3$s 패키지가 너"
 "무 최근 버전입니다"
 
 #: cmdline/apt-get.cc:2693
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s"
+msgstr "%2$s에 대한 %1$s 의존성을 만족시키는데 실패했습니다: %3$s"
 
 #: cmdline/apt-get.cc:2709
 #, c-format
@@ -1309,14 +1303,13 @@ msgstr "%s의 빌드 의존성을 만족시키지 못했습니다."
 
 #: cmdline/apt-get.cc:2714
 msgid "Failed to process build dependencies"
-msgstr "빌드 의존성을 처리하는 데 실패했습니다"
+msgstr "빌드 의존성을 처리하는데 실패했습니다"
 
 #: cmdline/apt-get.cc:2745
 msgid "Supported modules:"
 msgstr "지원하는 모듈:"
 
 #: cmdline/apt-get.cc:2786
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1382,6 +1375,8 @@ msgstr ""
 "   clean - 내려받은 아카이브 파일들을 지웁니다\n"
 "   autoclean - 과거에 내려받은 아카이브 파일들을 지웁니다\n"
 "   check - 의존성이 망가지지 않았는지 확인합니다\n"
+"   markauto - 패키지를 자동 설치로 표시합니다\n"
+"   unmarkauto - 패키지를 수동 설치로 표시합니다\n"
 "\n"
 "옵션:\n"
 "  -h  이 도움말.\n"
@@ -1408,6 +1403,10 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
+"알림: 시험 동작입니다!\n"
+"      실행하려면 apt-get을 실행할 때 루트 권한이 필요합니다.\n"
+"      또 잠금 기능을 사용하지 않는 상태이므로, 현재 상황에 의존하지\n"
+"      않도록 하십시오!"
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
@@ -1467,7 +1466,7 @@ msgstr ""
 "\n"
 "apt-sortpkgs는 패키지 파일을 정렬하는 간단한 도구입니다. -s 옵션은 무슨 파일"
 "인지\n"
-"알아 내는 데 쓰입니다.\n"
+"알아 내는데 쓰입니다.\n"
 "\n"
 "옵션:\n"
 "  -h   이 도움말\n"
@@ -1489,14 +1488,12 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "이전에 다운로드 받았던 .deb 파일을 지우시겠습니까?"
 
 #: dselect/install:101
-#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "압축을 푸는 데 몇몇 오류가 발생했습니다. 이미 설치된 패키지를"
+msgstr "압축을 푸는데 몇몇 오류가 발생했습니다. 설치된 패키지를"
 
 #: dselect/install:102
-#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "설정할 것입니다. 오류때문에 의존성을 만족하지 못해 설정하는 과정에서"
+msgstr "설정합니다. 오류때문에 의존성을 만족하지 못해 설정하는 과정에서"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1539,12 +1536,12 @@ msgstr "아카이브 서명이 틀렸습니다"
 
 #: apt-inst/contrib/arfile.cc:78
 msgid "Error reading archive member header"
-msgstr "아카이브 멤버 헤더를 읽는 데 오류가 발생했습니다"
+msgstr "아카이브 멤버 헤더를 읽는데 오류가 발생했습니다"
 
 #: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid archive member header %s"
-msgstr "아카이브 멤버 헤더가 잘못되었습니다"
+msgstr "아카이브 멤버 헤더 %s이(가) 잘못되었습니다"
 
 #: apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
@@ -1556,7 +1553,7 @@ msgstr "아카이브 길이가 너무 짧습니다"
 
 #: apt-inst/contrib/arfile.cc:132
 msgid "Failed to read the archive headers"
-msgstr "아카이브 헤더를 읽는 데 실패했습니다"
+msgstr "아카이브 헤더를 읽는데 실패했습니다"
 
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
@@ -1564,11 +1561,11 @@ msgstr "DropNode가 아직 연결되어 있는 노드에 대해 호출되었습�
 
 #: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
-msgstr "해시 항목을 찾는 데 실패했습니다"
+msgstr "해시 항목을 찾는데 실패했습니다"
 
 #: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
-msgstr "diversion을 할당하는 데 실패했습니다"
+msgstr "diversion을 할당하는데 실패했습니다"
 
 #: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
@@ -1592,12 +1589,12 @@ msgstr "%s/%s 설정 파일이 중복되었습니다"
 #: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
 #, c-format
 msgid "Failed to write file %s"
-msgstr "%s 파일을 쓰는 데 실패했습니다"
+msgstr "%s 파일을 쓰는데 실패했습니다"
 
 #: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
 #, c-format
 msgid "Failed to close file %s"
-msgstr "%s 파일을 닫는 데 실패했습니다"
+msgstr "%s 파일을 닫는데 실패했습니다"
 
 #: apt-inst/extract.cc:93 apt-inst/extract.cc:164
 #, c-format
@@ -1612,7 +1609,7 @@ msgstr "%s을(를) 두 번 이상 풀었습니다"
 #: apt-inst/extract.cc:134
 #, c-format
 msgid "The directory %s is diverted"
-msgstr "%s 디렉토리가 전환되었습니다"
+msgstr "%s 디렉터리가 전환되었습니다"
 
 #: apt-inst/extract.cc:144
 #, c-format
@@ -1626,11 +1623,11 @@ msgstr "전환하는 경로가 너무 깁니다"
 #: apt-inst/extract.cc:240
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
-msgstr "%s 디렉토리를 디렉토리가 아닌 파일로 덮어쓰려고 합니다"
+msgstr "%s 디렉터리를 디렉터리가 아닌 파일로 덮어쓰려고 합니다"
 
 #: apt-inst/extract.cc:280
 msgid "Failed to locate node in its hash bucket"
-msgstr "해시 버킷에서 노드를 찾는 데 실패했습니다"
+msgstr "해시 버킷에서 노드를 찾는데 실패했습니다"
 
 #: apt-inst/extract.cc:284
 msgid "The path is too long"
@@ -1665,7 +1662,7 @@ msgstr "%s의 정보를 읽을 수 없습니다"
 #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
 #, c-format
 msgid "Failed to remove %s"
-msgstr "%s을(를) 지우는 데 실패했습니다"
+msgstr "%s을(를) 지우는데 실패했습니다"
 
 #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format
@@ -1675,7 +1672,7 @@ msgstr "%s을(를) 만들 수 없습니다"
 #: apt-inst/deb/dpkgdb.cc:114
 #, c-format
 msgid "Failed to stat %sinfo"
-msgstr "%sinfo의 정보를 읽는 데 실패했습니다"
+msgstr "%sinfo의 정보를 읽는데 실패했습니다"
 
 #: apt-inst/deb/dpkgdb.cc:119
 msgid "The info and temp directories need to be on the same filesystem"
@@ -1690,12 +1687,12 @@ msgstr "패키지 목록을 읽는 중입니다"
 #: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
-msgstr "관리 디렉토리를 %sinfo로 바꾸는 데 실패했습니다"
+msgstr "관리 디렉토리를 %sinfo로 바꾸는데 실패했습니다"
 
 #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
 #: apt-inst/deb/dpkgdb.cc:444
 msgid "Internal error getting a package name"
-msgstr "패키지 이름을 가져오는 데 내부 오류"
+msgstr "패키지 이름을 가져오는데 내부 오류"
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
 msgid "Reading file listing"
@@ -1708,22 +1705,22 @@ msgid ""
 "then make it empty and immediately re-install the same version of the "
 "package!"
 msgstr ""
-"목록 파일 '%sinfo/%s' 파일을 여는 데 실패했습니다. 이 파일을 복구할 수 없다"
-"면 비워 놓고 같은 버전의 패키지를 다시 설치하십시오!"
+"목록 파일 '%sinfo/%s' 파일을 여는데 실패했습니다. 이 파일을 복구할 수 없다면 "
+"비워 놓고 같은 버전의 패키지를 다시 설치하십시오!"
 
 #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
-msgstr "목록 파일 %sinfo/%s 파일을 읽는 데 실패했습니다"
+msgstr "목록 파일 %sinfo/%s 파일을 읽는데 실패했습니다"
 
 #: apt-inst/deb/dpkgdb.cc:262
 msgid "Internal error getting a node"
-msgstr "노드를 얻어 오는 데 내부 오류"
+msgstr "노드를 얻어 오는데 내부 오류"
 
 #: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
-msgstr "전환 파일 %sdiversions를 여는 데 실패했습니다"
+msgstr "전환 파일 %sdiversions를 여는데 실패했습니다"
 
 #: apt-inst/deb/dpkgdb.cc:320
 msgid "The diversion file is corrupted"
@@ -1737,7 +1734,7 @@ msgstr "전환 파일에 잘못된 줄이 있습니다: %s"
 
 #: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
-msgstr "diversion을 추가하는 데 내부 오류"
+msgstr "diversion을 추가하는데 내부 오류"
 
 #: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
@@ -1746,7 +1743,7 @@ msgstr "패키지 캐시를 먼저 초기화해야 합니다"
 #: apt-inst/deb/dpkgdb.cc:439
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
-msgstr "패키지를 찾는 데 실패했습니다: 헤더, 오프셋 %lu"
+msgstr "패키지를 찾는데 실패했습니다: 헤더, 오프셋 %lu"
 
 #: apt-inst/deb/dpkgdb.cc:461
 #, c-format
@@ -1779,7 +1776,7 @@ msgstr "내부 오류, 멤버를 찾을 수 없습니다"
 
 #: apt-inst/deb/debfile.cc:173
 msgid "Failed to locate a valid control file"
-msgstr "올바른 control 파일을 찾는 데 실패했습니다"
+msgstr "올바른 control 파일을 찾는데 실패했습니다"
 
 #: apt-inst/deb/debfile.cc:258
 msgid "Unparsable control file"
@@ -1793,18 +1790,18 @@ msgstr "%s에 대한 파이프를 열 수 없습니다"
 #: methods/bzip2.cc:113
 #, c-format
 msgid "Read error from %s process"
-msgstr "%s 프로세스에서 읽는 데 오류가 발생했습니다"
+msgstr "%s 프로세스에서 읽는데 오류가 발생했습니다"
 
 #: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43
 #: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
 #: methods/rred.cc:495
 msgid "Failed to stat"
-msgstr "파일 정보를 읽는 데 실패했습니다"
+msgstr "파일 정보를 읽는데 실패했습니다"
 
 #: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
 #: methods/rred.cc:492
 msgid "Failed to set modification time"
-msgstr "파일 변경 시각을 설정하는 데 실패했습니다"
+msgstr "파일 변경 시각을 설정하는데 실패했습니다"
 
 #: methods/cdrom.cc:199
 #, c-format
@@ -2032,39 +2029,37 @@ msgstr "'%s'의 주소를 알아낼 수 없습니다"
 #: methods/connect.cc:193
 #, c-format
 msgid "Temporary failure resolving '%s'"
-msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다"
+msgstr "'%s'의 주소를 알아내는데 임시로 실패했습니다"
 
 #: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)"
+msgstr "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
 
 #: methods/connect.cc:243
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "%s %s에 연결할 수 없습니다:"
+msgstr "%s:%s에 연결할 수 없습니다:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
 msgid "No keyring installed in %s."
-msgstr "설치를 중단합니다."
+msgstr "%s에 키 모음을 설치하지 않았습니다."
 
 #: methods/gpgv.cc:163
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
+msgstr "내부 오류: 서명은 올바르지만 키 핑거프린트를 확인할 수 없습니다?!"
 
 #: methods/gpgv.cc:168
 msgid "At least one invalid signature was encountered."
 msgstr "최소한 하나 이상의 서명이 잘못되었습니다."
 
 #: methods/gpgv.cc:172
-#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습"
-"니까?)"
+"서명을 확인하는 'gpgv' 프로그램을 실행할 수 없습니다. (gpgv를 설치했습니까?)"
 
 #: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
@@ -2123,27 +2118,27 @@ msgstr "연결 시간이 초과했습니다"
 
 #: methods/http.cc:821
 msgid "Error writing to output file"
-msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
+msgstr "출력 파일에 쓰는데 오류가 발생했습니다"
 
 #: methods/http.cc:852
 msgid "Error writing to file"
-msgstr "파일에 쓰는 데 오류가 발생했습니다"
+msgstr "파일에 쓰는데 오류가 발생했습니다"
 
 #: methods/http.cc:880
 msgid "Error writing to the file"
-msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
+msgstr "해당 파일에 쓰는데 오류가 발생했습니다"
 
 #: methods/http.cc:894
 msgid "Error reading from server. Remote end closed connection"
-msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
+msgstr "서버에서 읽고 연결을 닫는데 오류가 발생했습니다"
 
 #: methods/http.cc:896
 msgid "Error reading from server"
-msgstr "서버에서 읽는 데 오류가 발생했습니다"
+msgstr "서버에서 읽는데 오류가 발생했습니다"
 
 #: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
 msgid "Failed to truncate file"
-msgstr "파일을 자르는 데 실패했습니다"
+msgstr "파일을 자르는데 실패했습니다"
 
 #: methods/http.cc:1154
 msgid "Bad header data"
@@ -2162,9 +2157,9 @@ msgid "Can't mmap an empty file"
 msgstr "빈 파일에 메모리 매핑할 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "%s에 대한 파이프를 열 수 없습니다"
+msgstr "%i 파일 디스크립터를 복사할 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
@@ -2172,14 +2167,12 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu바이트를 메모리 매핑할 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
 msgid "Unable to close mmap"
-msgstr "%s 열 수 없습니다"
+msgstr "mmap을 닫을 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "다음을 실행할 수 없습니다: "
+msgstr "mmap을 동기화할 수 없습니다"
 
 #: apt-pkg/contrib/mmap.cc:300
 #, c-format
@@ -2187,42 +2180,45 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
+"동적 mmap이 한계를 벗어났습니다. APT::Cache-Limit의 크기를 높이십시오. 현재 "
+"값: %lu. (man 5 apt.conf)"
 
 #: 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 "
 "reached."
-msgstr ""
+msgstr "mmap 크기를 늘릴 수 없습니다. 이미 %lu 바이트 한계에 도달했습니다."
 
 #: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
+"mmap 크기를 늘릴 수 없습니다. 자동으로 늘리는 기능을 사용자가 금지했습니다."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%li일 %li시간 %li분 %li초"
 
 #. h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%li시간 %li분 %li초"
 
 #. min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%limin %lis"
-msgstr ""
+msgstr "%li분 %li초"
 
 #. s means seconds
 #: apt-pkg/contrib/strutl.cc:390
 #, c-format
 msgid "%lis"
-msgstr ""
+msgstr "%li초"
 
 #: apt-pkg/contrib/strutl.cc:1119
 #, c-format
@@ -2275,9 +2271,9 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'"
 
 #: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다"
+msgstr "문법 오류 %s:%u: clear 지시어는 인수로 option 트리를 지정해야 합니다"
 
 #: apt-pkg/contrib/configuration.cc:827
 #, c-format
@@ -2387,9 +2383,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
 
 #: apt-pkg/contrib/fileutl.cc:635
-#, fuzzy, c-format
+#, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다."
+msgstr "하위 프로세스 %s 프로세스가 %u번 시그널을 받았습니다."
 
 #: apt-pkg/contrib/fileutl.cc:639
 #, c-format
@@ -2407,9 +2403,9 @@ msgid "Could not open file %s"
 msgstr "%s 파일을 열 수 없습니다"
 
 #: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file descriptor %d"
-msgstr "%s에 대한 파이프를 열 수 없습니다"
+msgstr "%d 파일 디스크립터를 열 수 없습니다"
 
 #: apt-pkg/contrib/fileutl.cc:774
 #, c-format
@@ -2422,28 +2418,28 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다"
 
 #: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "파일을 닫는 데 문제가 있습니다"
+msgstr "%s gzip 파일을 닫는데 문제가 있습니다"
 
 #: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the file %s"
-msgstr "파일을 닫는 데 문제가 있습니다"
+msgstr "%s 파일을 닫는데 문제가 있습니다"
 
 #: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "파일을 동기화하는 데 문제가 있습니다"
+msgstr "%s 파일을 %s(으)로 이름을 바꾸는데 문제가 있습니다"
 
 #: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
 msgid "Problem unlinking the file %s"
-msgstr "파일을 지우는 데 문제가 있습니다"
+msgstr "%s 파일을 삭제하는데 문제가 있습니다"
 
 #: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
-msgstr "파일을 동기화하는 데 문제가 있습니다"
+msgstr "파일을 동기화하는데 문제가 있습니다"
 
 #: apt-pkg/pkgcache.cc:142
 msgid "Empty package cache"
@@ -2500,7 +2496,7 @@ msgstr "망가뜨림"
 
 #: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
-msgstr ""
+msgstr "향상"
 
 #: apt-pkg/pkgcache.cc:303
 msgid "important"
@@ -2541,17 +2537,17 @@ msgstr "상태 정보를 읽는 중입니다"
 #: apt-pkg/depcache.cc:236
 #, c-format
 msgid "Failed to open StateFile %s"
-msgstr "상태파일 %s 여는 데 실패했습니다"
+msgstr "상태파일 %s 여는데 실패했습니다"
 
 #: apt-pkg/depcache.cc:242
 #, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr "임시 상태파일 %s 쓰는 데 실패했습니다"
+msgstr "임시 상태파일 %s 쓰는데 실패했습니다"
 
 #: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
+msgstr "내부 오류, '%s' 그룹에 설치할 수 있는 패키지가 없습니다."
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2564,29 +2560,30 @@ msgid "Unable to parse package file %s (2)"
 msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)"
 
 #: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 파싱 불가)"
 
 #: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([option] 너무 짧음)"
 
 #: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 대입이 아님)"
 
 #: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] 키가 없음)"
 
 #: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)"
+msgstr ""
+"소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 ([%3$s] %4$s 키에 값이 없음)"
 
 #: apt-pkg/sourcelist.cc:128
 #, c-format
@@ -2639,6 +2636,8 @@ msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
+"'%s'에 대해 즉시 설정을 할 수 없습니다. 자세한 설명은 man 5 apt.conf 페이지에"
+"서 APT::Immediate-Configure 항목을 보십시오. (%d)"
 
 #: apt-pkg/packagemanager.cc:452
 #, c-format
@@ -2648,8 +2647,8 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 "이번에 설치할 때 충돌/선의존성이 루프가 걸렸기 때문에 꼭 필요한 %s 패키지를 "
-"잠깐 지워야 합니다. 이 패키지를 지우는 건 좋지 않지만, 정말 지우려면 APT::"
-"Force-LoopBreak 옵션을 켜십시오."
+"잠깐 제거해야 합니다. 이 패키지를 제거하는 건 좋지 않지만, 정말 지우려면 "
+"APT::Force-LoopBreak 옵션을 켜십시오."
 
 #: apt-pkg/packagemanager.cc:495
 #, c-format
@@ -2657,6 +2656,8 @@ msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""
+"이미 압축이 풀린 '%s' 패키지에 대해 즉시 설정을 할 수 없습니다. 자세한 설명"
+"은 man 5 apt.conf 페이지에서 APT::Immediate-Configure 항목을 보십시오."
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
@@ -2687,23 +2688,23 @@ msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
-"일부 인덱스 파일을 다운로드하는 데 실패했습니다. 해당 파일을 무시하거나 과거"
+"일부 인덱스 파일을 다운로드하는데 실패했습니다. 해당 파일을 무시하거나 과거"
 "의 버전을 대신 사용합니다."
 
 #: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
 msgid "List directory %spartial is missing."
-msgstr "목록 디렉토리 %spartial이 빠졌습니다."
+msgstr "목록 디렉터리 %spartial이 빠졌습니다."
 
 #: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
 msgid "Archives directory %spartial is missing."
-msgstr "아카이브 디렉토리 %spartial이 빠졌습니다."
+msgstr "아카이브 디렉터리 %spartial이 빠졌습니다."
 
 #: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock directory %s"
-msgstr "목록 디렉토리를 잠글 수 없습니다"
+msgstr "%s 디렉터리를 잠글 수 없습니다"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2760,9 +2761,9 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다."
 
 #: apt-pkg/policy.cc:343
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다"
+msgstr "기본 설정 파일 %s에 잘못된 데이터가 있습니다. Package 헤더가 없습니다"
 
 #: apt-pkg/policy.cc:365
 #, c-format
@@ -2804,9 +2805,9 @@ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion1)"
+msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion%d)"
 
 #: apt-pkg/pkgcachegen.cc:320
 #, c-format
@@ -2860,7 +2861,7 @@ msgstr "파일에서 제공하는 것을 모으는 중입니다"
 
 #: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
 msgid "IO Error saving source cache"
-msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다"
+msgstr "소스 캐시를 저장하는데 입출력 오류가 발생했습니다"
 
 #: apt-pkg/acquire-item.cc:136
 #, c-format
@@ -2874,7 +2875,7 @@ msgstr "MD5Sum이 맞지 않습니다"
 #: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
 #: apt-pkg/acquire-item.cc:1713
 msgid "Hash Sum mismatch"
-msgstr "해쉬 합계가 서로 다릅니다"
+msgstr "해시 합이 맞지 않습니다"
 
 #: apt-pkg/acquire-item.cc:1240
 msgid "There is no public key available for the following key IDs:\n"
@@ -2886,12 +2887,12 @@ msgstr "다음 키 ID의 공개키가 없습니다:\n"
 #: apt-pkg/acquire-item.cc:1277
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgstr "Release 파일이 만료되었습니다. %s 무시. (%s 이후로 무효)"
 
 #: apt-pkg/acquire-item.cc:1298
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
 
 #: apt-pkg/acquire-item.cc:1324
 #, c-format
@@ -2899,11 +2900,13 @@ 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 ""
+"디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n"
+"예전의 인덱스 파일을 사용합니다. GPG 오류: %s: %s\n"
 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG 오류: %s: %s"
 
 #: apt-pkg/acquire-item.cc:1361
 #, c-format
@@ -2935,29 +2938,29 @@ msgid "Size mismatch"
 msgstr "크기가 맞지 않습니다"
 
 #: apt-pkg/indexrecords.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse Release file %s"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
+msgstr "Release 파일 %s 파일을 파싱할 수 없습니다"
 
 #: apt-pkg/indexrecords.cc:60
-#, fuzzy, c-format
+#, c-format
 msgid "No sections in Release file %s"
-msgstr "주의, %2$s 대신에 %1$s 패키지를 선택합니다\n"
+msgstr "Release 파일 %s에 섹션이 없습니다"
 
 #: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Release 파일 %s에 Hash 항목이 없습니다"
 
 #: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "전환 파일에 잘못된 줄이 있습니다: %s"
+msgstr "Release 파일 %s에 'Valid-Until' 항목이 잘못되었습니다"
 
 #: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)"
+msgstr "Release 파일 %s에 'Date' 항목이 잘못되었습니다"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
@@ -3020,6 +3023,8 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
+"패키지 파일이 하나도 없습니다. 아마도 데비안 디스크가 아니거나 아키텍처가 잘"
+"못된 것 같습니다?"
 
 #: apt-pkg/cdrom.cc:703
 #, c-format
@@ -3072,19 +3077,19 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상태로 썼습니다\n"
 
 #: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping nonexistent file %s"
-msgstr "설정 파일 %s 파일을 여는 중입니다"
+msgstr "%s 파일은 없으므로 무시합니다"
 
 #: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "다음의 인증 기록을 찾을 수 없습니다: %s"
 
 #: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
 msgid "Hash mismatch for: %s"
-msgstr "해쉬 합계가 서로 다릅니다"
+msgstr "다음의 해시가 다릅니다: %s"
 
 #: apt-pkg/cacheset.cc:337
 #, c-format
@@ -3097,19 +3102,19 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다"
 
 #: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task '%s'"
-msgstr "%s 작업를 찾을 수 없습니다"
+msgstr "'%s' 작업을 찾을 수 없습니다"
 
 #: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "%s 패키지를 찾을 수 없습니다"
+msgstr "'%s' 정규식에 해당하는 패키지가 없습니다"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
+msgstr "'%s' 패키지는 가상 패키지이므로 버전을 선택할 수 없습니다"
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
 #, c-format
@@ -3117,21 +3122,23 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
+"'%s' 패키지에서 설치한 버전이나 후보 버전을 선택할 수 없습니다. 둘 다 아닙니"
+"다."
 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "'%s' 패키지에서 최신 버전을 선택할 수 없습니다. 가상 패키지입니다."
 
 #: apt-pkg/cacheset.cc:499
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgstr "'%s' 패키지에서 후보 버전을 선택할 수 없습니다. 후보가 없습니다."
 
 #: apt-pkg/cacheset.cc:507
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgstr "'%s' 패키지에서 설치한 버전을 선택할 수 없습니다. 설치하지 않았습니다."
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
@@ -3149,14 +3156,14 @@ msgid "Removing %s"
 msgstr "%s 패키지를 지우는 중입니다"
 
 #: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
 msgid "Completely removing %s"
-msgstr "%s 패키지를 완전히 지웠습니다"
+msgstr "%s 패키지를 완전히 지우는 중입니다"
 
 #: apt-pkg/deb/dpkgpm.cc:56
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "%s 사라짐 발견했습니다"
 
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
@@ -3166,12 +3173,12 @@ msgstr "설치 후 트리거 %s 실행하는 중입니다"
 #: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
-msgstr "디렉토리 '%s' 없습니다."
+msgstr "디렉터리 '%s' 없습니다."
 
 #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file '%s'"
-msgstr "%s 파일을 열 수 없습니다"
+msgstr "'%s' 파일을 열 수 없습니다"
 
 #: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
@@ -3220,39 +3227,43 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
-msgstr ""
+msgstr "dpkg 실행하는 중입니다"
 
 #: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "보고서를 작성하지 않습니다. 이미 MaxReports 값에 도달했습니다."
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "의존성 문제 - 설정하지 않은 상태로 남겨둡니다"
 
 #: apt-pkg/deb/dpkgpm.cc:1280
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 예전의 실패 때문에 생긴 부수"
+"적인 오류입니다."
 
 #: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 디스크가 가득 찼습니다."
 
 #: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
-msgstr ""
+msgstr "보고서를 작성하지 않습니다. 오류 메시지에 따르면 메모리가 부족합니다."
 
 #: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
+"보고서를 작성하지 않습니다. 오류 메시지에 따르면 dpkg 입출력 오류입니다."
 
 #: apt-pkg/deb/debsystem.cc:69
 #, c-format
@@ -3260,11 +3271,13 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
+"관리 디렉터리를 (%s) 잠글 수 없습니다. 다른 프로세스가 사용하고 있지 않습니"
+"까?"
 
 #: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "목록 디렉토리를 잠글 수 없습니다"
+msgstr "관리 디렉터리를 (%s) 잠글 수 없습니다. 루트 사용자가 맞습니까?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3273,22 +3286,23 @@ msgstr "목록 디렉토리를 잠글 수 없습니다"
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
+"dpkg가 중단되었습니다. 수동으로 '%s' 명령을 실행해 문제점을 바로잡으십시오."
 
 #: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
-msgstr ""
+msgstr "잠기지 않음"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:200
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "'%s' 미러 파일이 없습니다 "
 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[미러 사이트: %s]"
 
 #: methods/rred.cc:465
 #, c-format
@@ -3296,6 +3310,8 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
+"%s 패치를 mmap과 파일 동작을 이용해 적용할 수 없습니다. 패치 파일이 손상된 것"
+"처럼 보입니다."
 
 #: methods/rred.cc:470
 #, c-format
@@ -3303,42 +3319,9 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
+"%s 패치를 mmap을 이용해 (mmap 관련 실패는 없음) 적용할 수 없습니다. 패치 파일"
+"이 손상된 것처럼 보입니다."
 
 #: methods/rsh.cc:329
 msgid "Connection closed prematurely"
 msgstr "연결이 너무 빨리 끊어졌습니다"
-
-#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#~ msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다."
-
-#~ msgid "Error occurred while processing %s (NewVersion2)"
-#~ msgstr "%s 처리하는 중에 오류가 발생했습니다 (NewVersion2)"
-
-#~ msgid "Malformed line %u in source list %s (vendor id)"
-#~ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)"
-
-#~ msgid "Couldn't access keyring: '%s'"
-#~ msgstr "키링에 접근할 수 없습니다: '%s'"
-
-#~ msgid "Could not patch file"
-#~ msgstr "%s 파일을 열 수 없습니다"
-
-#~ msgid "       %4i %s\n"
-#~ msgstr "       %4i %s\n"
-
-#~ msgid "%4i %s\n"
-#~ msgstr "%4i %s\n"
-
-#~ msgid "Processing triggers for %s"
-#~ msgstr "%s의 트리거를 처리하는 중입니다"
-
-#~ msgid "Dynamic MMap ran out of room"
-#~ msgstr "동적 메모리 매핑이 범위를 벗어났습니다"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "한 가지 작업만을 요청하셨으므로, 아마도 이 패키지를 설치할 수\n"
-#~ "없는 경우일 것이고 이 패키지에 버그 보고서를 제출해야 합니다."
diff --git a/po/pt.po b/po/pt.po
index 0f3a736f8..552bba0f8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,20 +1,21 @@
 # Debian-PT translation for apt.
 # Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006, 2007, 2008.
 #
 #
+# Miguel Figueiredo <elmig@debianpt.org>, 2005-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2008-09-09 20:54+0100\n"
+"PO-Revision-Date: 2010-08-28 09:03+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: Lokalize 1.0\n"
 
 #: cmdline/apt-cache.cc:156
 #, c-format
@@ -26,9 +27,8 @@ msgid "Total package names: "
 msgstr "Total de nomes de pacotes: "
 
 #: cmdline/apt-cache.cc:286
-#, fuzzy
 msgid "Total package structures: "
-msgstr "Total de nomes de pacotes: "
+msgstr "Total de estruturas de pacotes: "
 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
@@ -36,7 +36,7 @@ msgstr "  Pacotes normais: "
 
 #: cmdline/apt-cache.cc:327
 msgid "  Pure virtual packages: "
-msgstr "  Pacotes puramente virtuais: "
+msgstr "  Pacotes virtuais puros: "
 
 #: cmdline/apt-cache.cc:328
 msgid "  Single virtual packages: "
@@ -96,9 +96,8 @@ msgid "Package file %s is out of sync."
 msgstr "O ficheiro do pacote %s está dessincronizado."
 
 #: cmdline/apt-cache.cc:1273
-#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "Você deve passar exatamente um padrão"
+msgstr "Tem de fornecer pelo menos um padrão de busca"
 
 #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 #: cmdline/apt-cache.cc:1508
@@ -122,7 +121,7 @@ msgstr ""
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1554
 msgid "Pinned packages:"
-msgstr "Pacotes Marcados: "
+msgstr "Pacotes Marcados:"
 
 #: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
 msgid "(not found)"
@@ -157,7 +156,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado em %s %s\n"
 
 #: cmdline/apt-cache.cc:1739
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -207,16 +205,18 @@ msgstr ""
 "\n"
 "Comandos:\n"
 "   add - Adicionar um ficheiro de pacote à cache de código-fonte\n"
-"   gencaches - Construir as caches de pacotes e de fontes\n"
+"   gencaches - Construir as caches de pacotes e de código-fonte\n"
 "   showpkg - Mostrar informações gerais sobre um pacote\n"
-"   showsrc - Mostrar registros de código-fonte\n"
+"   showsrc - Mostrar registos de código-fonte\n"
 "   stats - Mostrar algumas estatísticas simples\n"
 "   dump - Mostrar todo o ficheiro de forma concisa\n"
-"   dumpavail - Imprimir um ficheiro disponível para stdout\n"
+"   dumpavail - Escrever um ficheiro disponível para stdout\n"
 "   unmet - Mostrar dependências não satisfeitas\n"
 "   search - Procurar na lista de pacotes por um padrão regex\n"
-"   show - Mostrar um registro legível sobre o pacote\n"
+"   show - Mostrar um registo legível sobre o pacote\n"
+"   showauto - Mostrar a lista dos pacotes automaticamente instalados.\n"
 "   depends - Mostrar informações em bruto de dependências de um pacote\n"
+"   rdepends - Mostrar a informação de dependências inversas de um pacote\n"
 "   pkgnames - Listar o nome de todos os pacotes no sistema\n"
 "   dotty - Gerar gráficos de pacotes para o GraphViz\n"
 "   xvcg - Gerar gráficos de pacotes para o xvcg\n"
@@ -228,25 +228,24 @@ msgstr ""
 "  -s=? A cache de fontes.\n"
 "  -q   Desabilitar o indicador de progresso.\n"
 "  -i   Mostrar apenas dependências importantes para o comando unmet.\n"
-"  -c=? Ler o ficheiro de configuração especificado.\n"
+"  -c=? Ler este ficheiro de configuração.\n"
 "  -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/"
 "tmp\n"
 "Para mais informações veja as páginas do manual apt-cache(8) e apt.conf(5).\n"
 
 #: cmdline/apt-cdrom.cc:77
-#, fuzzy
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
-"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'"
+"Por favor indique um nome para este Disco, tal como 'Debian 5.0.3 Disco 1'"
 
 #: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Por favor insira um Disco no leitor e pressione enter"
 
 #: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "Falhou renomear %s para %s"
+msgstr "Falhou ao montar '%s' para '%s'"
 
 #: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -426,7 +425,7 @@ msgstr ""
 "   -d=?  Seleccionar a base de dados de caching opcional\n"
 "   --no-delink Habilitar o modo de debug delinking\n"
 "   --contents  Controlar a criação do ficheiro de conteúdo\n"
-"   -c=?  Lêr este ficheiro de configuração\n"
+"   -c=?  Ler este ficheiro de configuração\n"
 "   -o=?  Definir uma opção de configuração arbitrária"
 
 #: ftparchive/apt-ftparchive.cc:796
@@ -449,13 +448,12 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "A base de dados é antiga, a tentar actualizar %s"
 
 #: ftparchive/cachedb.cc:72
-#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
-"O formato da base de dados é inválido. Se actualizou a partir de uma versão "
-"antiga do apt, por favor remova-a e crie novamente a base de dados."
+"O formato da BD é inválido. Se actualizou a partir de uma versão antiga do "
+"apt, por favor remova-a e crie novamente a base de dados."
 
 #: ftparchive/cachedb.cc:77
 #, c-format
@@ -470,7 +468,7 @@ msgstr "Falha stat %s"
 
 #: ftparchive/cachedb.cc:242
 msgid "Archive has no control record"
-msgstr "O arquivo não tem registro de controlo"
+msgstr "O arquivo não tem registo de controlo"
 
 #: ftparchive/cachedb.cc:448
 msgid "Unable to get a cursor"
@@ -640,7 +638,7 @@ msgstr "descompactador"
 
 #: ftparchive/multicompress.cc:403
 msgid "IO to subprocess/file failed"
-msgstr "Falhoi IO para subprocesso/arquivo"
+msgstr "Falhou o IO para subprocesso/arquivo"
 
 #: ftparchive/multicompress.cc:455
 msgid "Failed to read while computing MD5"
@@ -762,19 +760,19 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pacotes não totalmente instalados ou removidos.\n"
 
 #: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
+msgstr "Note, a seleccionar '%s' para a tarefa '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Note, a seleccionar %s para a expressão regular '%s'\n"
+msgstr "Note, a seleccionar '%s' para a expressão regular '%s'\n"
 
 #: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versão seleccionada %s (%s) para %s\n"
+msgstr "Versão seleccionada '%s' (%s) para '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -786,9 +784,8 @@ msgid " [Installed]"
 msgstr " [Instalado]"
 
 #: cmdline/apt-get.cc:677
-#, fuzzy
 msgid " [Not candidate version]"
-msgstr "Versões candidatas"
+msgstr "[Não é versão candidata]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -810,19 +807,19 @@ msgid "However the following packages replace it:"
 msgstr "No entanto, os seguintes pacotes substituem-no:"
 
 #: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "O pacote %s não tem candidato para instalação"
+msgstr "O pacote '%s' não tem candidato para instalação"
 
 #: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Pacotes virtuais como '%s' não podem ser removidos\n"
 
 #: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Note, a seleccionar %s em vez de %s\n"
+msgstr "Note, a seleccionar '%s' em vez de '%s'\n"
 
 #: cmdline/apt-get.cc:784
 #, c-format
@@ -830,9 +827,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
 
 #: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Saltando %s, já está instalado e a actualização não está definida.\n"
+msgstr "Saltando %s, não está instalado e só são pedidas actualizações.\n"
 
 #: cmdline/apt-get.cc:798
 #, c-format
@@ -1026,27 +1023,31 @@ msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
 msgstr[0] ""
+"O seguinte pacote desapareceu do seu sistema pois\n"
+"todos os ficheiros foram sobrescritos por outros pacotes:"
 msgstr[1] ""
+"Os seguintes pacotes desapareceram do seu sistema pois\n"
+"todos os ficheiros foram  por outros pacotes:"
 
 #: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "Nota: Isto foi feito automaticamente e intencionalmente pelo dpkg."
 
 #: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorar o lançamento pretendido, não disponível, '%s' do pacote '%s'"
 
 #: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s"
+msgstr "A escolher '%s' como pacote pacote de código fonte em vez de '%s'\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorar a versão '%s', não disponível, do pacote '%s'"
 
 #: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
@@ -1057,30 +1058,25 @@ msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover"
 
 #: cmdline/apt-get.cc:1653
-#, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] ""
-"Os seguintes pacotes foram instalados automaticamente e já não são "
-"necessários:"
+"O seguinte pacote foi instalado automaticamente e já não é necessário:"
 msgstr[1] ""
 "Os seguintes pacotes foram instalados automaticamente e já não são "
 "necessários:"
 
 #: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, 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] ""
-"Os seguintes pacotes foram instalados automaticamente e já não são "
-"necessários:"
+msgstr[0] "O pacote %lu foi instalado automaticamente e já não é necessário.\n"
 msgstr[1] ""
-"Os seguintes pacotes foram instalados automaticamente e já não são "
-"necessários:"
+"Os pacotes %lu foram instalados automaticamente e já não são necessários.\n"
 
 #: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
@@ -1162,9 +1158,9 @@ msgid "Couldn't find package %s"
 msgstr "Impossível encontrar o pacote %s"
 
 #: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s está definido para ser instalado manualmente.\n"
+msgstr "%s está definido para ser instalado automaticamente.\n"
 
 #: cmdline/apt-get.cc:2002
 msgid "Calculating upgrade... "
@@ -1201,6 +1197,9 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
+"AVISO: o empacotamento de '%s' é mantido no sistema de controle de versões "
+"'%s' em:\n"
+"%s\n"
 
 #: cmdline/apt-get.cc:2246
 #, c-format
@@ -1209,6 +1208,9 @@ msgid ""
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"Por favor utilize:\n"
+"bzr get %s\n"
+"para obter as últimas actualizações (possivelmente por lançar) ao pacote.\n"
 
 #: cmdline/apt-get.cc:2297
 #, c-format
@@ -1325,7 +1327,6 @@ msgid "Supported modules:"
 msgstr "Módulos Suportados:"
 
 #: cmdline/apt-get.cc:2786
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1374,8 +1375,8 @@ msgstr ""
 "            apt-get [opções] install|remove pacote1 [pacote2 ...]\n"
 "            apt-get [opções] source pacote1 [pacote2 ...]\n"
 "\n"
-"O apt-get é um interface simples de linha de comandos para fazer\n"
-"download e instalar pacotes. Os comandos utilizados mais frequentemente\n"
+"O apt-get é um interface simples de linha de comandos para obter\n"
+"e instalar pacotes. Os comandos utilizados mais frequentemente\n"
 "são update e install.\n"
 "\n"
 "Comandos:\n"
@@ -1384,15 +1385,17 @@ msgstr ""
 "   install - Instalar novos pacotes (o pacote é libc6 e não libc6.deb)\n"
 "   remove - Remover pacotes\n"
 "   autoremove - Remover automaticamente todos os pacotes não utilizados\n"
-"   purge - Remover e purgar pacotes\n"
+"   purge - Remover pacotes e ficheiros de configuração\n"
 "   source - Fazer o download de arquivos de código fonte\n"
 "   build-dep - Configurar as dependências de compilação de pacotes de código "
 "fonte\n"
 "   dist-upgrade - Actualizar a distribuição, veja apt-get(8)\n"
 "   dselect-upgrade - Seguir as escolhas feitas no dselect\n"
-"   clean - Apagar ficheiros de arquivo obtidos\n"
-"   autoclean - Apagar ficheiros de arquivo antigos obtidos\n"
+"   clean - Apagar ficheiros de arquivo obtidos por download\n"
+"   autoclean - Apagar ficheiros de arquivo antigos obtidos por download\n"
 "   check - Verificar se não existem dependências erradas\n"
+"   markauto - marcar os pacotes indicados como obtidos automaticamente\n"
+"   unmarkauto - desmarcar os pacotes indicadas como instalados manualmente\n"
 "\n"
 "Opções:\n"
 "  -h  Este texto de ajuda\n"
@@ -1404,13 +1407,13 @@ msgstr ""
 "  -f  Tentar corrigir um sistema com dependências erradas\n"
 "  -m  Tentar continuar se os arquivos não poderem ser localizados\n"
 "  -u  Mostrar também uma lista de pacotes actualizados\n"
-"  -b  Compilar o pacote de código fonte depois de o obter\n"
+"  -b  Construir o pacote de código fonte depois de o obter\n"
 "  -V  Mostrar números da versão detalhados\n"
 "  -c=? Ler este ficheiro de configuração\n"
-"  -o=? Definir uma opção de configuração arbitrária, \n"
-"       p.e. -o dir::cache=/tmp\n"
-"Para mais informações e opções veja as páginas do manual apt-get(8),\n"
-"sources.list(5) e apt.conf(5)\n"
+"  -o=? Definir uma opção de configuração arbitrária, p.e. -o dir::cache=/"
+"tmp\n"
+"Para mais informações e opções veja as páginas do manual\n"
+"apt-get(8), sources.list(5) e apt.conf(5)\n"
 "                         Este APT tem Poderes de Super Vaca.\n"
 
 #: cmdline/apt-get.cc:2958
@@ -1420,6 +1423,10 @@ msgid ""
 "      Keep also in mind that locking is deactivated,\n"
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
+"NOTE:\tIsto é apenas uma simulação!\n"
+"\to apt-get necessita de privilégios de root para a execução real.\n"
+"\tTenha em mente que o acesso exclusivo está desabilitado,\n"
+"\tpor isso não confie na relevância da real situação actual!"
 
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
@@ -1504,14 +1511,13 @@ msgstr "Deseja apagar quaisquer ficheiros .deb obtidos previamente?"
 # matter where sentences start, but it has to fit in just these four lines, and
 # at only 80 characters per line, if possible.
 #: dselect/install:101
-#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Ocorreram alguns erros ao descompactar. Vou configurar os pacotes"
+msgstr ""
+"Ocorreram alguns erros ao descompactar. Os pacotes que foram instalados"
 
 #: dselect/install:102
-#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr "que foram instalados. Isto pode resultar em erros duplicados"
+msgstr "serão configurados. Isto pode resultar em erros duplicados"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1558,9 +1564,9 @@ msgid "Error reading archive member header"
 msgstr "Erro na leitura de cabeçalho membro de arquivo"
 
 #: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid archive member header %s"
-msgstr "Cabeçalho membro de arquivo inválido"
+msgstr "Cabeçalho membro de arquivo inválido %s"
 
 #: apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
@@ -1691,7 +1697,7 @@ msgstr "Não foi capaz de criar %s"
 #: apt-inst/deb/dpkgdb.cc:114
 #, c-format
 msgid "Failed to stat %sinfo"
-msgstr "Falhou stat %sinfo."
+msgstr "Falhou stat %sinfo"
 
 #: apt-inst/deb/dpkgdb.cc:119
 msgid "The info and temp directories need to be on the same filesystem"
@@ -1918,7 +1924,7 @@ msgstr "Erro de leitura"
 
 #: methods/ftp.cc:351 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
-msgstr "Uma resposta sobrecarregou o buffer"
+msgstr "Uma resposta sobrecarregou o buffer."
 
 #: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
@@ -2053,20 +2059,20 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Falha temporária a resolver '%s'"
 
 #: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)"
+msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
 
 #: methods/connect.cc:243
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr "Não foi possível ligar a %s %s:"
+msgstr "Não foi possível ligar a %s:%s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
 msgid "No keyring installed in %s."
-msgstr "A abortar a instalação."
+msgstr "Nenhum keyring instalado em %s."
 
 #: methods/gpgv.cc:163
 msgid ""
@@ -2080,10 +2086,9 @@ msgid "At least one invalid signature was encountered."
 msgstr "Pelo menos uma assinatura inválida foi encontrada."
 
 #: methods/gpgv.cc:172
-#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
-"Não foi possível executar '%s' para verificar a assinatura (o gpgv está "
+"Não foi possível executar 'gpgv' para verificar a assinatura  (o gpgv está "
 "instalado?)"
 
 #: methods/gpgv.cc:177
@@ -2184,9 +2189,9 @@ msgid "Can't mmap an empty file"
 msgstr "Não é possível fazer mmap a um ficheiro vazio"
 
 #: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "Não foi possível abrir pipe para %s"
+msgstr "Não foi possível duplicar o descritor de ficheiro %i"
 
 #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
@@ -2194,14 +2199,12 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Não foi possível fazer mmap de %lu bytes"
 
 #: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
 msgid "Unable to close mmap"
-msgstr "Não foi possível abrir %s"
+msgstr "Não foi possível fechar mmap"
 
 #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "Não foi possível invocar "
+msgstr "Não foi sincronizar mmap "
 
 #: apt-pkg/contrib/mmap.cc:300
 #, c-format
@@ -2209,6 +2212,8 @@ msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
+"O Dynamic MMap ficou sem espaço. Por favor aumente o tamanho de APT::Cache-"
+"Limit. Valor actual: %lu. (man 5 apt.conf)"
 
 #: apt-pkg/contrib/mmap.cc:399
 #, c-format
@@ -2216,35 +2221,39 @@ msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
+"Não foi possível aumentar o tamanho do MMap pois o limite de %lu bytes já "
+"foi alcançado."
 
 #: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
+"Não foi possível aumentar o tamanho do MMap pois o crescimento automático "
+"está desabilitado pelo utilizador."
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
 #, c-format
 msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
 
 #. h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:378
 #, c-format
 msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
 
 #. min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:385
 #, c-format
 msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
 
 #. s means seconds
 #: apt-pkg/contrib/strutl.cc:390
 #, c-format
 msgid "%lis"
-msgstr ""
+msgstr "%lis"
 
 #: apt-pkg/contrib/strutl.cc:1119
 #, c-format
@@ -2269,7 +2278,7 @@ msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome."
 #: apt-pkg/contrib/configuration.cc:697
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Erro de sintaxe %s:%u: Tag malformada"
+msgstr "Erro de sintaxe %s:%u: Tag mal formada"
 
 #: apt-pkg/contrib/configuration.cc:714
 #, c-format
@@ -2298,10 +2307,11 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada"
 
 #: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
-"Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto"
+"Erro de sintaxe %s:%u: directiva clara necessita de uma árvore de opções "
+"como argumento"
 
 #: apt-pkg/contrib/configuration.cc:827
 #, c-format
@@ -2321,7 +2331,7 @@ msgstr "%c%s... Pronto"
 #: apt-pkg/contrib/cmndline.cc:77
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
-msgstr "Opção '%c' da linha de comandos [de %s] é desconnhecida."
+msgstr "Opção '%c' da linha de comandos [de %s] é desconhecida."
 
 #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
 #: apt-pkg/contrib/cmndline.cc:119
@@ -2414,9 +2424,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "O sub-processo %s recebeu uma falha de segmentação."
 
 #: apt-pkg/contrib/fileutl.cc:635
-#, fuzzy, c-format
+#, c-format
 msgid "Sub-process %s received signal %u."
-msgstr "O sub-processo %s recebeu uma falha de segmentação."
+msgstr "O sub-processo %s recebeu o sinal %u."
 
 #: apt-pkg/contrib/fileutl.cc:639
 #, c-format
@@ -2434,9 +2444,9 @@ msgid "Could not open file %s"
 msgstr "Não foi possível abrir ficheiro o %s"
 
 #: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file descriptor %d"
-msgstr "Não foi possível abrir pipe para %s"
+msgstr "Não foi possível abrir o descritor de ficheiro %d"
 
 #: apt-pkg/contrib/fileutl.cc:774
 #, c-format
@@ -2449,24 +2459,24 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "escrito, ainda restam %lu para escrever mas não foi possível"
 
 #: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "Problema ao fechar o ficheiro"
+msgstr "Problema ao fechar o ficheiro gzip %s"
 
 #: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the file %s"
-msgstr "Problema ao fechar o ficheiro"
+msgstr "Problema ao fechar o ficheiro %s"
 
 #: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "Problema sincronizando o ficheiro"
+msgstr "Problema ao renomear o ficheiro %s para %s"
 
 #: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
 msgid "Problem unlinking the file %s"
-msgstr "Problema ao remover o link ao ficheiro"
+msgstr "Problema ao remover o link do ficheiro %s"
 
 #: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
@@ -2527,7 +2537,7 @@ msgstr "Estraga"
 
 #: apt-pkg/pkgcache.cc:292
 msgid "Enhances"
-msgstr ""
+msgstr "Aumenta"
 
 #: apt-pkg/pkgcache.cc:303
 msgid "important"
@@ -2578,7 +2588,7 @@ msgstr "Falha escrever ficheiro temporário StateFile %s"
 #: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
+msgstr "Erro interno, grupo '%s' não tem pseudo-pacote instalável"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2591,54 +2601,57 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)"
 
 #: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
+msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([opção] não interpretável)"
 
 #: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Linha malformada %lu na lista de fontes %s (distribuição)"
+msgstr "Linha mal formada %lu na lista de fontes %s ([opção] demasiado curta)"
 
 #: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
+msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([%s] não é uma atribuição)"
 
 #: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s ([%s] não tem chave)"
 
 #: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
+msgstr ""
+"Linha mal formada %lu na lista de fontes %s ([%s] chave %s não tem valor)"
 
 #: apt-pkg/sourcelist.cc:128
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Linha malformada %lu na lista de fontes %s (URI)"
+msgstr "Linha mal formada %lu na lista de fontes %s (URI)"
 
 #: apt-pkg/sourcelist.cc:130
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Linha malformada %lu na lista de fontes %s (distribuição)"
+msgstr "Linha mal formada %lu na lista de fontes %s (distribuição)"
 
 #: apt-pkg/sourcelist.cc:133
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)"
+msgstr "Linha mal formada %lu na lista de fontes %s (parse de URI)"
 
 #: apt-pkg/sourcelist.cc:139
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Linha malformada %lu na lista de fontes %s (distribuição absoluta)"
+msgstr "Linha mal formada %lu na lista de fontes %s (distribuição absoluta)"
 
 #: apt-pkg/sourcelist.cc:146
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Linha malformada %lu na lista de fontes %s (dist parse)"
+msgstr "Linha mal formada %lu na lista de fontes %s (dist parse)"
 
 #: apt-pkg/sourcelist.cc:244
 #, c-format
@@ -2653,7 +2666,7 @@ msgstr "Linha %u é demasiado longa na lista de fontes %s."
 #: apt-pkg/sourcelist.cc:281
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
-msgstr "Linha malformada %u na lista de fontes %s (tipo)"
+msgstr "Linha mal formada %u na lista de fontes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:285
 #, c-format
@@ -2666,6 +2679,8 @@ msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
+"Não foi possível proceder à configuração imediata em '%s'. Para detalhes, "
+"por favor veja man 5 apt.conf em APT::Immediate-Configure. (%d)"
 
 #: apt-pkg/packagemanager.cc:452
 #, c-format
@@ -2685,6 +2700,8 @@ msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""
+"Não foi possível proceder à configuração imediata no já descompactado '%s'."
+"Para mais detalhes por favor veja man 5 apt.conf em APT::Immediate-Configure."
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
@@ -2722,19 +2739,19 @@ msgstr ""
 "antigos foram usados em seu lugar."
 
 #: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
 msgid "List directory %spartial is missing."
 msgstr "Falta directório de listas %spartial."
 
 #: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
 msgid "Archives directory %spartial is missing."
-msgstr "Falta o directório de repositório %spartial."
+msgstr "Falta o directório de arquivos %spartial."
 
 #: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock directory %s"
-msgstr "Impossível criar acesso exclusivo ao directório de listas"
+msgstr "Impossível criar acesso exclusivo ao directório %s"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2756,7 +2773,7 @@ msgstr "O driver do método %s não pôde ser encontrado."
 #: apt-pkg/acquire-worker.cc:159
 #, c-format
 msgid "Method %s did not start correctly"
-msgstr "Método %s não iniciou corretamente"
+msgstr "Método %s não iniciou correctamente"
 
 #: apt-pkg/acquire-worker.cc:413
 #, c-format
@@ -2794,9 +2811,9 @@ msgid "You may want to run apt-get update to correct these problems"
 msgstr "Você terá que executar apt-get update para corrigir estes problemas"
 
 #: apt-pkg/policy.cc:343
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package"
+msgstr "Registo inválido no ficheiro de preferências %s, sem cabeçalho Package"
 
 #: apt-pkg/policy.cc:365
 #, c-format
@@ -2838,9 +2855,9 @@ msgstr "Ocorreu um erro ao processar %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Ocorreu um erro ao processar %s (NewVersion1)"
+msgstr "Ocorreu um erro ao processar %s (NewVersion%d)"
 
 #: apt-pkg/pkgcachegen.cc:320
 #, c-format
@@ -2928,12 +2945,12 @@ msgstr ""
 #: apt-pkg/acquire-item.cc:1277
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgstr "Ficheiro Release expirou, a ignorar %s (inválido desde %s)"
 
 #: apt-pkg/acquire-item.cc:1298
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
 #: apt-pkg/acquire-item.cc:1324
 #, c-format
@@ -2941,11 +2958,14 @@ msgid ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used.GPG error: %s: %s\n"
 msgstr ""
+"Ocorreu um erro durante a verificação da assinatura. O repositório não está "
+"actualizado e serão utilizados os ficheiros anteriores de índice. Erro do "
+"GPG: %s: %s\n"
 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "Erro GPG: %s: %s"
 
 #: apt-pkg/acquire-item.cc:1361
 #, c-format
@@ -2979,29 +2999,29 @@ msgid "Size mismatch"
 msgstr "Tamanho incorrecto"
 
 #: apt-pkg/indexrecords.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse Release file %s"
-msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
+msgstr "Não foi possível fazer parse ao ficheiro Release %s"
 
 #: apt-pkg/indexrecords.cc:60
-#, fuzzy, c-format
+#, c-format
 msgid "No sections in Release file %s"
-msgstr "Note, a seleccionar %s em vez de %s\n"
+msgstr "Nenhuma secção, no ficheiro Release %s"
 
 #: apt-pkg/indexrecords.cc:94
 #, c-format
 msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Nenhuma entrada hash no ficheiro Release %s"
 
 #: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Linha inválida no ficheiro de desvio: %s"
+msgstr "Entrada inválida, 'Valid-until', no ficheiro de Release: %s"
 
 #: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)"
+msgstr "Entrada, 'Date', inválida no ficheiro Release %s"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
@@ -3066,6 +3086,8 @@ msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
+"Não foi possível localizar quaisquer ficheiros de pacote, talvez este não "
+"seja um disco Debian ou seja a arquitectura errada?"
 
 #: apt-pkg/cdrom.cc:703
 #, c-format
@@ -3120,19 +3142,19 @@ msgstr ""
 "coincidentes\n"
 
 #: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping nonexistent file %s"
-msgstr "A abrir o ficheiro de configuração %s"
+msgstr "A saltar ficheiro %s inexistente"
 
 #: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Não foi possível encontrar registo de autenticação para: %s"
 
 #: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Código de verificação hash não coincide"
+msgstr "Hash não coincide para: %s"
 
 #: apt-pkg/cacheset.cc:337
 #, c-format
@@ -3145,19 +3167,20 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "Não foi encontrada a versão '%s' para '%s'"
 
 #: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task '%s'"
-msgstr "Não foi possível encontrar a tarefa %s"
+msgstr "Não foi possível encontrar a tarefa '%s'"
 
 #: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "Impossível encontrar o pacote %s"
+msgstr "Não foi possível encontrar o pacote através da expressão regular '%s'"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it purely virtual"
 msgstr ""
+"Não foi possível seleccionar versões do pacote '%s' pois é puramente virtual"
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
 #, c-format
@@ -3165,21 +3188,29 @@ msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
+"Não pode seleccionar a versão instalada nem a versão candidata do pacote "
+"'%s' pois não tem nenhuma destas"
 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
+"Não foi possível seleccionar a versão mais recente a partir do pacote '%s' "
+"já que é puramente virtual"
 
 #: apt-pkg/cacheset.cc:499
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
+"Não é possível seleccionar a versão candidata do pacote %s já que não tem "
+"candidato"
 
 #: apt-pkg/cacheset.cc:507
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
+"Não é possível seleccionar a versão instalada do pacote %s pois não está "
+"instalado"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
@@ -3197,14 +3228,14 @@ msgid "Removing %s"
 msgstr "A remover %s"
 
 #: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
 msgid "Completely removing %s"
-msgstr "Remoção completa de %s"
+msgstr "A remover completamente %s"
 
 #: apt-pkg/deb/dpkgpm.cc:56
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "A notar o desaparecimento de %s"
 
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
@@ -3217,9 +3248,9 @@ msgid "Directory '%s' missing"
 msgstr "Falta o directório '%s'"
 
 #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir ficheiro o %s"
+msgstr "Não foi possível abrir ficheiro o '%s'"
 
 #: apt-pkg/deb/dpkgpm.cc:812
 #, c-format
@@ -3269,39 +3300,47 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Running dpkg"
-msgstr ""
+msgstr "A correr o dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "Nenhum relatório apport escrito pois MaxReports já foi atingido"
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "problemas de dependências - deixando por configurar"
 
 #: apt-pkg/deb/dpkgpm.cc:1280
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica que é um erro "
+"de seguimento de um erro anterior."
 
 #: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica erro de disco "
+"cheio"
 
 #: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de "
+"memória esgotada"
 
 #: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
+"Nenhum relatório apport escrito pois a mensagem de erro indica um erro de I/"
+"O do dpkg"
 
 #: apt-pkg/deb/debsystem.cc:69
 #, c-format
@@ -3309,11 +3348,15 @@ msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
+"Não foi possível obter acesso exclusivo ao directório de administração (%s), "
+"outro processo está a utilizá-lo?"
 
 #: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Impossível criar acesso exclusivo ao directório de listas"
+msgstr ""
+"Não foi possível criar acesso exclusivo ao directório de administração (%s), "
+"é root?"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3322,22 +3365,24 @@ msgstr "Impossível criar acesso exclusivo ao directório de listas"
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr ""
+"O dpkg foi interrompido, para corrigir o problema tem de correr manualmente "
+"'%s'"
 
 #: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
-msgstr ""
+msgstr "Sem acesso exclusivo"
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:200
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Não foi encontrado ficheiro de mirror '%s'"
 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Mirror: %s]"
 
 #: methods/rred.cc:465
 #, c-format
@@ -3345,6 +3390,8 @@ msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
+"Não foi possível aplicar o patch %s com mmap e com a utilização de operação "
+"de ficheiro - o patch parece estar corrompido."
 
 #: methods/rred.cc:470
 #, c-format
@@ -3352,6 +3399,8 @@ msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
+"Não foi possível aplicar o patch %s com mmap (mas não é uma falha especifica "
+"do mmap) - o patch parece corrompido."
 
 #: methods/rsh.cc:329
 msgid "Connection closed prematurely"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1545d1a14..a87c90696 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,20 +3,21 @@
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008.
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
-# Aron Xu <happyaron.xu@gmail.com>, 2009.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: apt 0.8.0~pre1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2009-12-02 01:00+0800\n"
+"PO-Revision-Date: 2010-08-26 14:42+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: cmdline/apt-cache.cc:156
 #, c-format
@@ -28,9 +29,8 @@ msgid "Total package names: "
 msgstr "软件包名称总数："
 
 #: cmdline/apt-cache.cc:286
-#, fuzzy
 msgid "Total package structures: "
-msgstr "软件包名称总数："
+msgstr "全部软件包结构："
 
 #: cmdline/apt-cache.cc:326
 msgid "  Normal packages: "
@@ -98,9 +98,8 @@ msgid "Package file %s is out of sync."
 msgstr "软件包文件 %s 尚未同步。"
 
 #: cmdline/apt-cache.cc:1273
-#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr "您必须明确地给出一个表达式"
+msgstr "您必须明确地给出至少一个表达式"
 
 #: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
 #: cmdline/apt-cache.cc:1508
@@ -158,7 +157,6 @@ msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1739
-#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -216,6 +214,7 @@ msgstr ""
 "   unmet - 显示所有未满足的依赖关系\n"
 "   search - 根据正则表达式搜索软件包列表\n"
 "   show - 以便于阅读的格式介绍该软件包\n"
+"   showauto - 显示自动安装的软件包的列表\n"
 "   depends - 显示该软件包的依赖关系信息\n"
 "   rdepends - 显示所有依赖于该软件包的软件包名字\n"
 "   pkgnames - 列出所有软件包的名字\n"
@@ -242,9 +241,9 @@ msgid "Please insert a Disc in the drive and press enter"
 msgstr "请把盘片插入驱动器再按回车键"
 
 #: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr "无法将 %s 重命名为 %s"
+msgstr "无法将 %s 挂载到 %s"
 
 #: cmdline/apt-cdrom.cc:162
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -444,7 +443,6 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "数据库已过期，现尝试进行升级 %s"
 
 #: ftparchive/cachedb.cc:72
-#, fuzzy
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
@@ -756,19 +754,19 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "有 %lu 个软件包没有被完全安装或卸载。\n"
 
 #: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+msgstr "注意，为任务 %2$s 选中了 %1$s\n"
 
 #: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n"
+msgstr "注意，根据正则表达式 %2$s 选中了 %1$s\n"
 
 #: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "选定了版本为 %s (%s) 的 %s\n"
+msgstr "为 %3$s 选定了版本 %1$s (%2$s)\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -780,9 +778,8 @@ msgid " [Installed]"
 msgstr " [已安装]"
 
 #: cmdline/apt-get.cc:677
-#, fuzzy
 msgid " [Not candidate version]"
-msgstr "候选版本"
+msgstr " [无候选版本]"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
@@ -804,17 +801,17 @@ msgid "However the following packages replace it:"
 msgstr "可是下列软件包取代了它："
 
 #: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "软件包 %s 还没有可供安装的候选者"
+msgstr "软件包 %s 没有可供安装的候选者"
 
 #: cmdline/apt-get.cc:723
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "类似 %s 的虚拟软件包可以卸载\n"
 
 #: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "注意，选取 %s 而非 %s\n"
 
@@ -824,9 +821,9 @@ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
 
 #: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "忽略了 %s，它已经被安装而且没有指定要升级。\n"
+msgstr "忽略了 %s，它已经被安装而且仅请求了升级。\n"
 
 #: cmdline/apt-get.cc:798
 #, c-format
@@ -1015,28 +1012,27 @@ msgid ""
 msgid_plural ""
 "The following packages disappeared from your system as\n"
 "all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "以下软件包因为文件已被其他软件包覆盖而消失："
 
 #: cmdline/apt-get.cc:1324
 msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "注意：这是自动被 dpkg 有意完成的。"
 
 #: cmdline/apt-get.cc:1454
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "忽略不可用的软件包 %2$s 的目标发行版本 %1$s"
 
 #: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "无法获取源软件包列表 %s 的状态"
+msgstr "选择 %s 作为源代码包而非 %s\n"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1524
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "忽略不可用的 %2$s 软件包的 %1$s 版"
 
 #: cmdline/apt-get.cc:1540
 msgid "The update command takes no arguments"
@@ -1048,31 +1044,35 @@ msgstr "我们不应该进行删除，无法启动自动删除器"
 
 #: cmdline/apt-get.cc:1653
 #, fuzzy
+#| msgid ""
+#| "The following package is automatically installed and is no longer "
+#| "required:"
+#| msgid_plural ""
+#| "The following packages were automatically installed and are no longer "
+#| "required:"
 msgid ""
 "The following package was automatically installed and is no longer required:"
 msgid_plural ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr[0] "下列软件包是自动安装的并且现在不需要了："
-msgstr[1] "下列软件包是自动安装的并且现在不需要了："
 
 #: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu 个自动安装的的软件包现在不需要了\n"
-msgstr[1] "%lu 个自动安装的的软件包现在不需要了\n"
+msgstr[0] "%lu 个自动安装的的软件包现在已不再需要了。\n"
 
 #: cmdline/apt-get.cc:1659
 msgid "Use 'apt-get autoremove' to remove them."
-msgstr "使用'apt-get autoremove'来删除它们"
+msgstr "使用'apt-get autoremove'来卸载它们"
 
 #: cmdline/apt-get.cc:1664
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
-msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
+msgstr "似乎自动卸载工具损坏了一些软件，这不应该发生。请向 apt 提交错误报告。"
 
 #.
 #. if (Packages == 1)
@@ -1090,7 +1090,7 @@ msgstr "下列信息可能会对解决问题有所帮助："
 
 #: cmdline/apt-get.cc:1671
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr "内部错误，自动删除工具坏事了"
+msgstr "内部错误，自动卸载工具坏事了"
 
 #: cmdline/apt-get.cc:1690
 msgid "Internal error, AllUpgrade broke stuff"
@@ -1141,7 +1141,7 @@ msgid "Couldn't find package %s"
 msgstr "无法找到软件包 %s"
 
 #: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 被设置为手动安装。\n"
 
@@ -1180,6 +1180,8 @@ msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
+"提示：%s 的打包工作被维护于以下位置的 %s 版本控制系统中：\n"
+"%s\n"
 
 #: cmdline/apt-get.cc:2246
 #, c-format
@@ -1188,6 +1190,9 @@ msgid ""
 "bzr get %s\n"
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
+"请使用：\n"
+"bzr get %s\n"
+"获得该软件包的最近更新(可能尚未正式发布)。\n"
 
 #: cmdline/apt-get.cc:2297
 #, c-format
@@ -1296,7 +1301,6 @@ msgid "Supported modules:"
 msgstr "支持的模块："
 
 #: cmdline/apt-get.cc:2786
-#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1351,17 +1355,19 @@ msgstr ""
 "命令：\n"
 "   update - 取回更新的软件包列表信息\n"
 "   upgrade - 进行一次升级\n"
-"   install - 安装新的软件包(注：包名是 libc6 而非 libc6.deb)\n"
+"   install - 安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)\n"
 "   remove - 卸载软件包\n"
 "   autoremove - 卸载所有自动安装且不再使用的软件包\n"
 "   purge - 卸载并清除软件包的配置\n"
 "   source - 下载源码包文件\n"
-"   build-dep - 为源码包配置所需的构建依赖关系\n"
+"   build-dep - 为源码包配置所需的编译依赖关系\n"
 "   dist-upgrade - 发布版升级，见 apt-get(8)\n"
 "   dselect-upgrade - 根据 dselect 的选择来进行升级\n"
 "   clean - 删除所有已下载的包文件\n"
 "   autoclean - 删除老版本的已下载的包文件\n"
 "   check - 核对以确认系统的依赖关系的完整性\n"
+"   markauto - 标记指定的软件包为自动安装\n"
+"   unmarkauto - 标记指定的软件包为手动安装\n"
 "\n"
 "选项：\n"
 "  -h  本帮助文档。\n"
@@ -1644,7 +1650,7 @@ msgstr "无法读取 %s 的状态"
 #: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
 #, c-format
 msgid "Failed to remove %s"
-msgstr "无法删除 %s"
+msgstr "无法卸载 %s"
 
 #: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
 #, c-format
@@ -2013,9 +2019,9 @@ msgid "Temporary failure resolving '%s'"
 msgstr "暂时不能解析域名“%s”"
 
 #: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "解析“%s:%s”时，出现了某些故障(%i)"
+msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
 
 #: methods/connect.cc:243
 #, c-format
@@ -2024,9 +2030,9 @@ msgstr "不能连接到 %s：%s："
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
 msgid "No keyring installed in %s."
-msgstr "中止安装。"
+msgstr "%s 中没有安装密钥环。"
 
 #: methods/gpgv.cc:163
 msgid ""
@@ -2038,9 +2044,8 @@ msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
 
 #: methods/gpgv.cc:172
-#, fuzzy
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)"
+msgstr "无法运行 gpgv 以验证签名(您安装了 gpgv 吗？)"
 
 #: methods/gpgv.cc:177
 msgid "Unknown error executing gpgv"
@@ -2138,9 +2143,9 @@ msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
 #: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr "无法为 %s 开启管道"
+msgstr "无法为复制文件描述符 %i"
 
 #: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
 #, c-format
@@ -2148,14 +2153,12 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
 #: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
 msgid "Unable to close mmap"
-msgstr "无法打开 %s"
+msgstr "无法关闭 mmap"
 
 #: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr "无法调用 "
+msgstr "无法同步 mmap "
 
 #: apt-pkg/contrib/mmap.cc:300
 #, c-format
@@ -2171,12 +2174,12 @@ msgstr ""
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
-msgstr ""
+msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
 
 #: apt-pkg/contrib/mmap.cc:402
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
 
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:371
@@ -2230,12 +2233,12 @@ msgstr "语法错误 %s:%u：标签格式有误"
 #: apt-pkg/contrib/configuration.cc:714
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据"
+msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
 
 #: apt-pkg/contrib/configuration.cc:754
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
+msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
 
 #: apt-pkg/contrib/configuration.cc:761
 #, c-format
@@ -2245,22 +2248,22 @@ msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 #: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
-msgstr "语法错误 %s:%u: Included from here"
+msgstr "语法错误 %s:%u：Included from here"
 
 #: apt-pkg/contrib/configuration.cc:774
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "语法错误 %s:%u: 不支持的指令“%s”"
+msgstr "语法错误 %s:%u：不支持的指令“%s”"
 
 #: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示"
+msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
 
 #: apt-pkg/contrib/configuration.cc:827
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据"
+msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
 
 #: apt-pkg/contrib/progress.cc:153
 #, c-format
@@ -2385,9 +2388,9 @@ msgid "Could not open file %s"
 msgstr "无法打开文件 %s"
 
 #: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file descriptor %d"
-msgstr "无法为 %s 开启管道"
+msgstr "无法打开文件描述符 %d"
 
 #: apt-pkg/contrib/fileutl.cc:774
 #, c-format
@@ -2400,24 +2403,24 @@ msgid "write, still have %lu to write but couldn't"
 msgstr "写入文件出错，还剩 %lu 字节没有保存"
 
 #: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the gzip file %s"
-msgstr "关闭文件出错"
+msgstr "关闭 gzip %s 文件出错"
 
 #: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
 msgid "Problem closing the file %s"
-msgstr "关闭文件出错"
+msgstr "关闭文件 %s 出错"
 
 #: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr "同步文件出错"
+msgstr "重命名文件 %s 为 %s 出错"
 
 #: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
 msgid "Problem unlinking the file %s"
-msgstr "用 unlink 删除文件出错"
+msgstr "用 unlink 删除文件 %s 出错"
 
 #: apt-pkg/contrib/fileutl.cc:938
 msgid "Problem syncing the file"
@@ -2529,7 +2532,7 @@ msgstr "无法写入临时状态文件 %s"
 #: apt-pkg/depcache.cc:921
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
+msgstr "内部错误，组 %s 没有可安装的 pseudo 软件包"
 
 #: apt-pkg/tagfile.cc:102
 #, c-format
@@ -2542,29 +2545,29 @@ msgid "Unable to parse package file %s (2)"
 msgstr "无法解析软件包文件 %s (2)"
 
 #: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 无法解析)"
 
 #: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([选项] 太短)"
 
 #: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 不是一个任务)"
 
 #: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 没有键)"
 
 #: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)"
+msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误([%3$s] 键 %4$s 没有值)"
 
 #: apt-pkg/sourcelist.cc:128
 #, c-format
@@ -2617,6 +2620,8 @@ msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
+"无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure "
+"(%d)"
 
 #: apt-pkg/packagemanager.cc:452
 #, c-format
@@ -2635,6 +2640,8 @@ msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""
+"无法立即对已经解包的 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-"
+"Configure。"
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
@@ -2669,19 +2676,19 @@ msgstr ""
 "有一些索引文件不能下载，它们可能被忽略了，也可能转而使用了旧的索引文件。"
 
 #: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
 msgid "List directory %spartial is missing."
 msgstr "软件包列表的目录 %spartial 缺失。"
 
 #: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
 msgid "Archives directory %spartial is missing."
-msgstr "找不到“%spartial”目录。"
+msgstr "仓库目录 %spartial 确实。"
 
 #: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock directory %s"
-msgstr "无法对状态列表目录加锁"
+msgstr "无法对目录 %s 加锁"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2781,9 +2788,9 @@ msgstr "处理 %s (NewFileVer1)时出错"
 
 #: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
 #: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "处理 %s (NewVersion1)时出错"
+msgstr "处理 %s (NewVersion%d)时出错"
 
 #: apt-pkg/pkgcachegen.cc:320
 #, c-format
@@ -2863,12 +2870,12 @@ msgstr "以下 ID 的密钥没有可用的公钥：\n"
 #: apt-pkg/acquire-item.cc:1277
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgstr "Release 文件已过期，忽略 %s (从 %s 起无效)"
 
 #: apt-pkg/acquire-item.cc:1298
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
 #: apt-pkg/acquire-item.cc:1324
 #, c-format
@@ -2876,11 +2883,12 @@ msgid ""
 "A error occurred during the signature verification. The repository is not "
 "updated and the previous index files will be used.GPG error: %s: %s\n"
 msgstr ""
+"校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n"
 
 #: apt-pkg/acquire-item.cc:1333
 #, c-format
 msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG 错误：%s: %s"
 
 #: apt-pkg/acquire-item.cc:1361
 #, c-format
@@ -2925,14 +2933,14 @@ msgid "No Hash entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
 #: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
 
 #: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
+msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
@@ -3051,19 +3059,19 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
 #: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
 msgid "Skipping nonexistent file %s"
-msgstr "正在打开配置文件 %s"
+msgstr "跳过不存在的文件 %s"
 
 #: apt-pkg/indexcopy.cc:538
 #, c-format
 msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "无法找到认证记录：%s"
 
 #: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
 msgid "Hash mismatch for: %s"
-msgstr "Hash 校验和不符"
+msgstr "Hash 校验和不符：%s"
 
 #: apt-pkg/cacheset.cc:337
 #, c-format
@@ -3076,41 +3084,41 @@ msgid "Version '%s' for '%s' was not found"
 msgstr "未找到“%2$s”的“%1$s”版本"
 
 #: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find task '%s'"
 msgstr "无法找到任务 %s"
 
 #: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr "无法找到软件包 %s"
+msgstr "无法按照正则表达式 %s 找到任何软件包"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
+msgstr "无法从完全虚拟的软件包 %s 中选择版本"
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
-msgstr ""
+msgstr "因为软件包 %s 没有已安装或候选的版本，无法进行选择"
 
 #: apt-pkg/cacheset.cc:491
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "因为软件包 %s 是完全的虚拟软件包，无法选择它的最新版"
 
 #: apt-pkg/cacheset.cc:499
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgstr "因为软件包 %s 没有候选版本，无法进行选择"
 
 #: apt-pkg/cacheset.cc:507
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgstr "因为软件包 %s 没有安装，无法选择它的已安装版本"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
@@ -3128,14 +3136,14 @@ msgid "Removing %s"
 msgstr "正在删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
 msgid "Completely removing %s"
-msgstr "完全删除了 %s"
+msgstr "完全删除 %s"
 
 #: apt-pkg/deb/dpkgpm.cc:56
 #, c-format
 msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "注意到 %s 已经消失"
 
 #: apt-pkg/deb/dpkgpm.cc:57
 #, c-format
@@ -3145,10 +3153,10 @@ msgstr "执行安装后执行的触发器 %s"
 #: apt-pkg/deb/dpkgpm.cc:643
 #, c-format
 msgid "Directory '%s' missing"
-msgstr "目录 %s 不见了"
+msgstr "目录 %s 缺失"
 
 #: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件 %s"
 
@@ -3202,35 +3210,35 @@ msgstr "正在运行 dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1273
 msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error
 #: apt-pkg/deb/dpkgpm.cc:1278
 msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "依赖问题 - 保持未配置"
 
 #: apt-pkg/deb/dpkgpm.cc:1280
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
-msgstr ""
+msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
 #: apt-pkg/deb/dpkgpm.cc:1286
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
-msgstr ""
+msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
 #: apt-pkg/deb/dpkgpm.cc:1292
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
-msgstr ""
+msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
 #: apt-pkg/deb/dpkgpm.cc:1299
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 
 #: apt-pkg/deb/debsystem.cc:69
 #, c-format
@@ -3247,10 +3255,10 @@ msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root �
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
 #: apt-pkg/deb/debsystem.cc:88
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此问题。"
+msgstr "dpkg 被中断，您必须手工运行 %s 解决此问题。"
 
 #: apt-pkg/deb/debsystem.cc:106
 msgid "Not locked"
@@ -3261,26 +3269,26 @@ msgstr "未锁定"
 #: methods/mirror.cc:200
 #, c-format
 msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "没有找到镜像文件 %s"
 
 #: methods/mirror.cc:343
 #, c-format
 msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[镜像：%s]"
 
 #: methods/rred.cc:465
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
-msgstr ""
+msgstr "无法连同 mmap 和文件操作用途为 %s 打补丁 - 补丁可能已损坏。"
 
 #: methods/rred.cc:470
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
-msgstr ""
+msgstr "无法连同 mmap 为 %s 打补丁(但没有 mmap 的错误) - 补丁可能已损坏。"
 
 #: methods/rsh.cc:329
 msgid "Connection closed prematurely"
diff --git a/test/integration/test-autoremove b/test/integration/test-autoremove
new file mode 100755
index 000000000..fb39e979a
--- /dev/null
+++ b/test/integration/test-autoremove
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+
+local TESTDIR=$(readlink -f $(dirname $0))
+. $TESTDIR/framework
+setupenvironment
+configarchitecture "i386"
+
+buildsimplenativepackage "unrelated" "all" "1" "unstable"
+buildsimplenativepackage "po-debconf" "all" "1.0.16" "unstable"
+buildsimplenativepackage "debhelper" "all" "8.0.0" "unstable" "Depends: po-debconf"
+setupaptarchive
+
+aptget install unrelated debhelper -qq 2>&1 > /dev/null
+
+testfileequal "rootdir/var/lib/apt/extended_states" "Package: po-debconf
+Architecture: i386
+Auto-Installed: 1
+"
+aptget remove debhelper -y -qq 2>&1 > /dev/null
+aptget autoremove -y -qq 2>&1 > /dev/null
+
+testfileequal "rootdir/var/lib/apt/extended_states" ""
+
+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" '
+Install: unrelated:i386 (1), debhelper:i386 (8.0.0), po-debconf:i386 (1.0.16, automatic)
+
+Remove: debhelper:i386 (8.0.0)
+
+Remove: po-debconf:i386 (1.0.16)'
author	Michael Vogt <michael.vogt@ubuntu.com>	2010-08-30 12:29:52 +0200
committer	Michael Vogt <michael.vogt@ubuntu.com>	2010-08-30 12:29:52 +0200
commit	927cd722ce0e21c290a00eaa5670f0d41287a7df (patch)
tree	3382089c284d47f0971af775ea3ca75c6d44beab
parent	1497b87da18106b38f004990ca4bf7ee79862b1d (diff)
parent	4cb0cd1648e4a2623cb00a11b2db2649e286706d (diff)