* merged with mainline

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-105
   Proofread by Fred Bothamy

 * bubulle@debian.org--2005/apt--main--0--patch-106
   Merge with mvo

 * bubulle@debian.org--2005/apt--main--0--patch-107
   Italian translation corrected

 * bubulle@debian.org--2005/apt--main--0--patch-108
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-109
   Italian translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-110
   Swedish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-111
   Merge with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-112
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-113
   Silly update to French translation (testing)

 * bubulle@debian.org--2005/apt--main--0--patch-114
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-115
   Basque translation completed

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
   * leak fix for debian #250583

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
   * changelog update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64
   * merged with bubulle 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
   * inital support for "apt-get source -t dist" (but no downgrades yet

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
   * full support for apt-get source -t now (and honor pining too)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
   * added APT::Authentication::Trust-CDROM option

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
   * fix a crash in apt-ftparchive

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
   * sparc64 alignment fix

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
   * fix segfault when there is no Archive for a VerFile

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
   * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
   * corrections in the changelog

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
   * init the default ScreenWidth to 79 columns by default (Closes: #324921)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
   apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
   * seting section to "admin" to match override file

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
   * finalized the changelog

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-79

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
   * implemented "TrustCDROM" mode

 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
   * added APT::Authentication::TrustCDROM to the configure-index

14 files changed, 320 insertions, 500 deletions

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 9e20f7cef..9447e9956 100644
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -58,7 +58,7 @@ class MD5SumValue
 
 class MD5Summation
 {
-   unsigned char Buf[4*4];
+   uint32_t Buf[4];
    unsigned char Bytes[2*4];
    unsigned char In[16*4];
    bool Done;
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index bc22fba67..e395e6cc7 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -155,9 +155,9 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace)
    unsigned long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
-   else
+   else if(WorkSpace > 0)
    {
-      Fd->Seek(WorkSpace);
+      Fd->Seek(WorkSpace - 1);
       char C = 0;
       Fd->Write(&C,sizeof(C));
    }
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index 8dfbf7aff..ea53a847e 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -173,6 +173,10 @@ bool debReleaseIndex::IsTrusted() const
    string VerifiedSigFile = _config->FindDir("Dir::State::lists") +
       URItoFileName(MetaIndexURI("Release")) + ".gpg";
    
+   if(_config->FindB("APT::Authentication::Trust-CDROM", false))
+      if(URI.substr(0,strlen("cdrom:")) == "cdrom:")
+	 return true;
+   
    if (FileExists(VerifiedSigFile))
       return true;
    return false;
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 2578f9c6b..7434a7225 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -75,7 +75,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text)
 
 bool pkgCdromTextStatus::AskCdromName(string &name) 
 {
-   cout << "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" << flush;
+   cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush;
    name = PromptLine("");
 	 
    return true;
@@ -90,7 +90,7 @@ void pkgCdromTextStatus::Update(string text, int current)
 
 bool pkgCdromTextStatus::ChangeCdrom() 
 {
-   Prompt("Please insert a Disc in the drive and press enter");
+   Prompt(_("Please insert a Disc in the drive and press enter"));
    return true;
 }
 
@@ -114,7 +114,7 @@ bool DoAdd(CommandLine &)
    pkgCdrom cdrom;
    res = cdrom.Add(&log);
    if(res)
-      cout << "Repeat this process for the rest of the CDs in your set." << endl;
+      cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
    return res;
 }
 									/*}}}*/
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index a22d881b6..3475d79ae 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -66,7 +66,7 @@ ostream c0out(0);
 ostream c1out(0);
 ostream c2out(0);
 ofstream devnull("/dev/null");
-unsigned int ScreenWidth = 80;
+unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
 
 // class CacheFile - Cover class for some dependency cache functions	/*{{{*/
 // ---------------------------------------------------------------------
@@ -1190,24 +1190,54 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
    string VerTag;
    string TmpSrc = Name;
    string::size_type Slash = TmpSrc.rfind('=');
+
+   // honor default release
+   string DefRel = _config->Find("APT::Default-Release");
+   pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+
    if (Slash != string::npos)
    {
       VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
       TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
+   } 
+   else  if(DefRel.empty() == false) 
+   {
+      // we have a default release, try to locate the pkg. we do it like
+      // this because GetCandidateVer() will not "downgrade", that means
+      // "apt-get source -t stable apt" won't work on a unstable system
+      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; 
+	   Ver++)
+      {
+	 for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
+	      VF++)
+	 {
+	    /* If this is the status file, and the current version is not the
+	       version in the status file (ie it is not installed, or somesuch)
+	       then it is not a candidate for installation, ever. This weeds
+	       out bogus entries that may be due to config-file states, or
+	       other. */
+	    if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 
+		pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
+	    continue;
+	    
+	    //std::cout << VF.File().Archive() << std::endl;
+	    if(VF.File().Archive() && (VF.File().Archive() == DefRel)) 
+	    {
+	       VerTag = Ver.VerStr();
+	       break;
+	    }
+	 }
+      }
    }
-   
+
    /* Lookup the version of the package we would install if we were to
       install a version and determine the source package name, then look
-      in the archive for a source package of the same name. In theory
-      we could stash the version string as well and match that too but
-      today there aren't multi source versions in the archive. */
-   if (_config->FindB("APT::Get::Only-Source") == false && 
-       VerTag.empty() == true)
+      in the archive for a source package of the same name. */
+   if (_config->FindB("APT::Get::Only-Source") == false)
    {
-      pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
       if (Pkg.end() == false)
       {
-	 pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);      
+	 pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
 	 if (Ver.end() == false)
 	 {
 	    pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
@@ -1265,10 +1295,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       }      
    }
    
-   if (Last == 0)
-      return 0;
-   
-   if (Last->Jump(Offset) == false)
+   if (Last == 0 || Last->Jump(Offset) == false)
       return 0;
    
    return Last;
diff --git a/debian/changelog b/debian/changelog
index acf74d166..0e85b5117 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,36 @@
-apt (0.6.41.1) unstable; urgency=low
+apt (0.6.42) unstable; urgency=low
 
   * apt-pkg/cdrom.cc:
     - unmount the cdrom when apt failed to locate any package files
   * allow cdrom failures and fallback to other sources in that case
     (closes: #44135)
   * better error text when dpkg-source fails 
-  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104:
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115:
     - patch-99: Added Galician translation
     - patch-100: Completed Danish translation (Closes: #325686)
     - patch-104: French translation completed
-  * applied frensh man-page update (thanks to Philippe Batailler)
+    - patch-109: Italian translation completed
+    - patch-112: Swedish translation update 
+    - patch-115: Basque translation completed (Closes: #333299)
+  * applied french man-page update (thanks to Philippe Batailler)
+    (closes: #316638, #327456)
+  * fix leak in the mmap code, thanks to Daniel Burrows for the
+    patch (closes: #250583)
+  * support for apt-get [build-dep|source] -t (closes: #152129)
+  * added "APT::Authentication::Trust-CDROM" option to make the life
+    for the installer people easier (closes: #334656)
+  * fix crash in apt-ftparchive (thanks to Bastian Blank for the patch)
+    (closes: #334671)
+  * apt-pkg/contrib/md5.cc:
+    - fix a alignment problem on sparc64 that gives random bus errors
+      (thanks to Fabbione for providing a test-case)
+  * init the default ScreenWidth to 79 columns by default 
+    (Closes: #324921)
+  * cmdline/apt-cdrom.cc: 
+    - fix some missing gettext() calls (closes: #334539)
+  * doc/apt-cache.8.xml: fix typo (closes: #334714)
   
- -- 
+ -- Michael Vogt <mvo@debian.org>  Wed, 19 Oct 2005 22:02:09 +0200
 
 apt (0.6.41) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6d9418a46..4aa7b5aa2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg
-Section: base
+Section: admin
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a 
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 34749fd77..0e1d2f8d9 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -214,7 +214,7 @@ Reverse Provides:
      </varlistentry>
 
      <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
-     <listitem><para><literal>rdepends</literal>shows a listing of each reverse dependency a
+     <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a
       package has.</para></listitem>
      </varlistentry>
 
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index dee0c06ff..5ab84fe05 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -72,6 +72,11 @@ APT
      NoAct "false";
   };
 
+  Authentication
+  {
+     Trust-CDROM "false";            // consider the CDROM always trusted
+  };
+
   GPGV
   {
      TrustedKeyring "/etc/apt/trusted.gpg";
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 0b68d0bbf..fc9ea27d7 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -581,8 +581,6 @@ bool SourcesWriter::DoPackage(string FileName)
 	 auto_ptr<Override::Item> Itm(BOver.GetItem(BinList[I]));
 	 if (Itm.get() == 0)
 	    continue;
-	 if (OverItem.get() == 0)
-	    OverItem = Itm;
 
 	 unsigned char NewPrioV = debListParser::GetPrio(Itm->Priority);
 	 if (NewPrioV < BestPrioV || BestPrio.empty() == true)
@@ -590,6 +588,9 @@ bool SourcesWriter::DoPackage(string FileName)
 	    BestPrioV = NewPrioV;
 	    BestPrio = Itm->Priority;
 	 }	 
+
+	 if (OverItem.get() == 0)
+	    OverItem = Itm;
       }
    }
    
diff --git a/po/eu.po b/po/eu.po
index e21e36e29..81d1a588a 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,19 +1,22 @@
-# translation of apt-eu.po to Basque 
+# translation of eu.po to librezale.org
+# translation of apt_po_eu.po to librezale.org
+# translation of apt-eu.po to Basque
 # This file is put in the public domain.
 # Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>, 2005.
+# Piarres Beobide <pi@beobide.net>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-eu\n"
+"Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-04-20 20:05+0200\n"
-"Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizkpol@ej-gv.es>\n"
-"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
+"PO-Revision-Date: 2005-10-11 20:03+0200\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: librezale.org <librezale@librezale.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
@@ -689,7 +692,6 @@ msgid "%s (due to %s) "
 msgstr "%s (arrazoia: %s) "
 
 #: cmdline/apt-get.cc:544
-#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -756,7 +758,7 @@ msgstr "KONTUZ: Hurrengo paketeak ezin dira egiaztatu!"
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Egiaztapen abisua gainidazten.\n"
 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "
@@ -772,16 +774,15 @@ msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Barne errorea, InstallPackages apurturiko paketeez deitu da!"
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paketeak ezabatu beharra dute bain Ezabatzea ezgaiturik dago."
 
 #: cmdline/apt-get.cc:773
-#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr "Barne errorea desbideratze bat gehitzean"
+msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
 #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
 msgid "Unable to lock the download directory"
@@ -795,6 +796,8 @@ msgstr "Ezin izan da iturburu-zerrenda irakurri."
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
+"Hau bitxia.. Tamainak ez dira berdina, idatzi apt@packages.debian.org-ra "
+"berri emanez (ingelesez)"
 
 #: cmdline/apt-get.cc:819
 #, c-format
@@ -817,9 +820,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Deskonprimitu ondoren, %sB libratuko dira diskoan.\n"
 
 #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Ez daukazu nahikoa leku libre %s(e)n."
+msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 
 #: cmdline/apt-get.cc:847
 #, c-format
@@ -835,7 +838,7 @@ msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
 #: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
@@ -1055,9 +1058,8 @@ msgid "Done"
 msgstr "Eginda"
 
 #: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
+msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
 #: cmdline/apt-get.cc:1856
 msgid "Must specify at least one package to fetch source for"
@@ -1095,8 +1097,7 @@ msgstr "Huts egin du zenbat artxibo lortzean."
 #: cmdline/apt-get.cc:2003
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr ""
-"%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
+msgstr "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
 #: cmdline/apt-get.cc:2015
 #, c-format
@@ -1106,7 +1107,7 @@ msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 #: cmdline/apt-get.cc:2016
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Egiaztattu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
 #: cmdline/apt-get.cc:2033
 #, c-format
@@ -1119,8 +1120,7 @@ msgstr "Prozesu umeak huts egin du"
 
 #: cmdline/apt-get.cc:2068
 msgid "Must specify at least one package to check builddeps for"
-msgstr ""
-"Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
+msgstr "Gutxienez pakete bat zehaztu behar duzu eraikitze-mendekotasunak egiaztatzeko"
 
 #: cmdline/apt-get.cc:2096
 #, c-format
@@ -1137,8 +1137,7 @@ msgstr "%s: ez du eraikitze-mendekotasunik.\n"
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
-msgstr ""
-"%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
+msgstr "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
 #: cmdline/apt-get.cc:2220
 #, c-format
@@ -1341,8 +1340,7 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "edo falta diren mendekotasunen erroreak. Hori ondo dago; mezu honen"
 
 #: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 "aurreko erroreak dira garrantzitsuak. Konpondu eta exekutatu [I]nstall "
 "berriro"
@@ -1424,7 +1422,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Konfigurazio-fitxategi bikoiztua: %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "Ezin izan da %s fitxategian idatzi"
 
@@ -1601,8 +1599,7 @@ msgstr "Ez da baliozko DEB artxiboa; '%s' kidea falta da"
 #: apt-inst/deb/debfile.cc:52
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Hau ez da balioz DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
+msgstr "Hau ez da balioz DEB fitxategi bat, ez du ez  '%s' ez '%s' atalik falta du"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
@@ -1644,9 +1641,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Ezin izan da CDROMa %s(e)n muntatu; beharbada erabiltzen ariko da."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Ez da fitxategia aurkitu"
+msgstr "Ez da diska aurkitu"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
@@ -1743,8 +1739,7 @@ msgstr "Ezin izan da socket-a sortu"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da datu-socketa konektatu; konexioak denbora-muga gainditu du"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
@@ -1838,8 +1833,7 @@ msgstr "Ezin izan da konexioa hasi -> %s:%s (%s)."
 #: methods/connect.cc:93
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr ""
-"Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
+msgstr "Ezin izan da konektatu -> %s:%s (%s). Konexioak denbora-muga gainditu du"
 
 #: methods/connect.cc:106
 #, c-format
@@ -1875,41 +1869,40 @@ msgstr "Ezin da konektatu -> %s %s:"
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Acquire::gpgv::Options arguimentu zerrenda luzeegia. Uzten."
 
 #: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu"
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Beintza sinadura baliogabe bat aurkitu da."
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
-#, fuzzy
 msgid "Could not execute "
-msgstr "Ezin izan da %s blokeoa hartu"
+msgstr "Ezin izan da %s exekutatu"
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " sinadura egiaztatzeko (gnupg instalaturik al dago?)"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Errore ezezaguna gpgv exekutatzean"
 
 #: methods/gpgv.cc:237
-#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
+msgstr "Ondorengo sinadurak baliogabeak dira:\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Ondorengo sinadurak ezin dira egiaztatu gako publikoa ez bait dago "
+"eskuragarri:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -2097,8 +2090,7 @@ msgstr "%s aukerak argumentu bat behar du."
 #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr ""
-"%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
+msgstr "%s aukera: konfigurazio-elementuaren zehaztapenak =<val> eduki behar du."
 
 #: apt-pkg/contrib/cmndline.cc:237
 #, c-format
@@ -2149,8 +2141,7 @@ msgstr "Ezin izan da %s blokeo-fitxategia ireki"
 #: apt-pkg/contrib/fileutl.cc:105
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
-msgstr ""
-"Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
+msgstr "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo-fitxategiarentzat"
 
 #: apt-pkg/contrib/fileutl.cc:109
 #, c-format
@@ -2364,10 +2355,8 @@ msgstr "'%s' motako indize-fitxategirik ez da onartzen"
 
 #: apt-pkg/algorithms.cc:241
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "%s paketea berriro instalatu behar da, baina ezin dut artxiborik aurkitu."
 
 #: apt-pkg/algorithms.cc:1059
 msgid ""
@@ -2394,7 +2383,7 @@ msgstr "%spartial artxibo-direktorioa falta da."
 #: apt-pkg/acquire.cc:817
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "%li fitxategi deskargatzen %li -fitxategitik (%s falta da)"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2407,11 +2396,9 @@ msgid "Method %s did not start correctly"
 msgstr "%s metodoa ez da behar bezala abiarazi"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Euskarri-aldaketa: sartu '%s'\n"
-"diskoa '%s' unitatean, eta sakatu Sartu\n"
+msgstr "Mesedez sa ''%s' izeneko diska '%s' gailuan eta enter sakatu"
 
 #: apt-pkg/init.cc:119
 #, c-format
@@ -2560,8 +2547,7 @@ msgstr ""
 
 #: apt-pkg/acquire-item.cc:811
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
@@ -2573,7 +2559,7 @@ msgstr "Tamaina ez dator bat"
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
-msgstr "%s saltzaile blokeak ez du egiatzpen markarik"
+msgstr "%s saltzaile blokeak ez du egiaztapen markarik"
 
 #: apt-pkg/cdrom.cc:507
 #, c-format
@@ -2667,251 +2653,59 @@ msgstr "%i erregistro eta %i okerreko fitxategi grabaturik.\n"
 #: apt-pkg/indexcopy.cc:269
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-"%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
+msgstr "%i erregistro, %i galdutako fitxategi eta %i okerreko fitxategi grabaturik.\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "%s irekitzen"
+msgstr "%s prestatzen"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
 msgstr "%s irekitzen"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "%s konfigurazio-fitxategia irekitzen"
+msgstr "%s konfiguratzeko prestatzen"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Konektatzen -> %s..."
+msgstr "%s konfiguratzen"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Instalatuta: "
+msgstr "%s Instalatuta"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "%s kentzeko prestatzen"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "%s irekitzen"
+msgstr "%s kentzen"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Gomendioa:"
+msgstr "%s kendurik"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "%s konfigurazioaz ezabatzeko prestatzen"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
-msgstr ""
+msgstr "%s konfigurazioaz kentzen"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
 
-#~ msgid "Total Package Names : "
-#~ msgstr "Pakete-izenak guztira: "
-
-#~ msgid "  Normal Packages: "
-#~ msgstr "  Pakete normalak: "
-
-#~ msgid "  Pure Virtual Packages: "
-#~ msgstr "  Pakete birtual puruak: "
-
-#~ msgid "  Single Virtual Packages: "
-#~ msgstr "  Pakete birtual soilak: "
-
-#~ msgid "  Mixed Virtual Packages: "
-#~ msgstr "  Pakete birtual nahasiak: "
-
-#~ msgid "Total Distinct Versions: "
-#~ msgstr "Bertsio desberdinak guztira: "
-
-#~ msgid "Total Dependencies: "
-#~ msgstr "Mendekotasunak guztira: "
-
-#~ msgid "Total Ver/File relations: "
-#~ msgstr "Bertsio/fitxategi erlazioak guztira: "
-
-#~ msgid "Total Provides Mappings: "
-#~ msgstr "Hornidura-mapatzeak guztira: "
-
-#~ msgid "Total Globbed Strings: "
-#~ msgstr "Globalizatutako kateak guztira: "
-
-#~ msgid "Total Dependency Version space: "
-#~ msgstr "Mendekotasun-bertsioen lekua guztira: "
-
-#~ msgid "Total Slack space: "
-#~ msgstr "Slack lekua guztira: "
-
-#~ msgid "Total Space Accounted for: "
-#~ msgstr "Hartutako lekua guztira: "
-
-#~ msgid "Package Files:"
-#~ msgstr "Pakete-fitxategiak:"
-
-#~ msgid "Pinned Packages:"
-#~ msgstr "Orratzdun paketeak (pin):"
-
-#~ msgid "  Package Pin: "
-#~ msgstr "  Pakete-orratza (pin): "
-
-#~ msgid "  Version Table:"
-#~ msgstr "  Bertsio-taula:"
-
-#~ msgid "Error Processing directory %s"
-#~ msgstr "Errorea %s direktorioa prozesatzean"
-
-#~ msgid "Error Processing Contents %s"
-#~ msgstr "Errorea %s edukia prozesatzean"
-
-#~ msgid "Unknown Compresison Algorithm '%s'"
-#~ msgstr "Konpresio-algoritmo ezezaguna: '%s'"
-
-#~ msgid "Compress Child"
-#~ msgstr "Konprimitu umea"
-
-#~ msgid "Internal Error, Failed to create %s"
-#~ msgstr "Barne-errorea. Ezin izan da %s sortu"
-
-#~ msgid "Packages need to be removed but Remove is disabled."
-#~ msgstr ""
-#~ "Paketeak kendu egin behar dira, baina Kentzeko aukera desgaituta dago."
-
-#~ msgid "Do you want to continue? [Y/n] "
-#~ msgstr "Jarraitu nahi duzu? [B/e] "
-
-#~ msgid "Aborting Install."
-#~ msgstr "Instalazioa abortatzen."
-
-#~ msgid "Internal Error, AllUpgrade broke stuff"
-#~ msgstr "Barne-errorea, AllUpgrade-k zerbait hautsi du"
-
-#~ msgid "Calculating Upgrade... "
-#~ msgstr "Bertsio-berritzea kalkulatzen... "
-
-#~ msgid "Fetch Source %s\n"
-#~ msgstr "Lortu %s iturburua\n"
-
-#~ msgid "Supported Modules:"
-#~ msgstr "Onartutako moduluak:"
-
-#~ msgid "Merging Available information"
-#~ msgstr "Informazio erabilgarria batzen"
-
-#~ msgid "Tar Checksum failed, archive corrupted"
-#~ msgstr "Tar Checksum-ek huts egin du; artxiboa hondatuta dago"
-
-#~ msgid "Internal Error in AddDiversion"
-#~ msgstr "Barne-errorea AddDiversion-en"
-
-#~ msgid "Reading Package Lists"
-#~ msgstr "Pakete-zerrendak irakurtzen"
-
-#~ msgid "Internal Error getting a Package Name"
-#~ msgstr "Barne-errorea pakete-izen bat eskuratzean"
-
-#~ msgid "Reading File Listing"
-#~ msgstr "Fitxategi-zerrenda irakurtzen"
-
-#~ msgid "Internal Error getting a Node"
-#~ msgstr "Barne-errorea nodo bat eskuratzean"
-
-#~ msgid "Internal Error adding a diversion"
-#~ msgstr "Barne-errorea desbideratze bat gehitzean"
-
-#~ msgid "Reading File List"
-#~ msgstr "Fitxategi-zerrenda irakurtzen"
-
-#~ msgid "Failed to find a Package: Header, offset %lu"
-#~ msgstr "Ezin izan da aurkitu Paketea: Goiburua, desplazamendua %lu"
-
-#~ msgid "Internal Error, could not locate member %s"
-#~ msgstr "Barne-errorea; ezin izan da %s kidea lokalizatu"
-
-#~ msgid "Internal Error, could not locate member"
-#~ msgstr "Barne-errorea; ezin izan da kidea lokalizatu"
-
-#~ msgid "Unparsible control file"
-#~ msgstr "Kontrol-fitxategi analizaezina"
-
-#~ msgid ""
-#~ "Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-#~ "cannot be used to add new CDs"
-#~ msgstr ""
-#~ "Erabili apt-cdrom, CD hau APTk identifika dezan. apt-get eguneratzea ezin "
-#~ "da erabili CD berriak gehitzeko"
-
-#~ msgid "Wrong CD"
-#~ msgstr "CD okerra"
-
-#~ msgid "Server refused our connection and said: %s"
-#~ msgstr "Zerbitzariak gure konexioa ezetsi du, eta hau esan du: %s"
-
-#~ msgid "Write Error"
-#~ msgstr "Idazketa-errorea"
-
-#~ msgid "The http server sent an invalid reply header"
-#~ msgstr "Http zerbitzariak erantzun-goiburu baliogabe bat bidali du"
-
-#~ msgid "The http server sent an invalid Content-Length header"
-#~ msgstr "Http zerbitzariak Content-Length goiburu baliogabe bat bidali du"
-
-#~ msgid "The http server sent an invalid Content-Range header"
-#~ msgstr "Http zerbitzariak Content-Range goiburu baliogabe bat bidali du"
-
-#~ msgid "This http server has broken range support"
-#~ msgstr "Http zerbitzari honek barruti-onarpena hautsita dauka"
-
-#~ msgid "Error reading from server Remote end closed connection"
-#~ msgstr "Errorea zerbitzaritik irakurtzean: Urruneko aldeak konexioa itxi du"
-
-#~ msgid "Bad header Data"
-#~ msgstr "Okerreko goiburu-datuak"
-
-#~ msgid "Syntax error %s:%u: Malformed Tag"
-#~ msgstr "Sintaxi-errorea, %s:%u: Etiketa gaizki osatuta"
-
-#~ msgid "Waited, for %s but it wasn't there"
-#~ msgstr "%s(r)en zain egon da, baina ez zegoen hor"
-
-#~ msgid "This APT does not support the Versioning System '%s'"
-#~ msgstr "APT honek ez du onartzen '%s' bertsio-sistema"
-
-#~ msgid "Building Dependency Tree"
-#~ msgstr "Mendekotasunen zuhaitza eraikitzen"
-
-#~ msgid "Candidate Versions"
-#~ msgstr "Hautagai dauden bertsioak"
-
-#~ msgid "Dependency Generation"
-#~ msgstr "Mendekotasunak sortzea"
-
-#~ msgid "Malformed line %lu in source list %s (Absolute dist)"
-#~ msgstr "Gaizki osatutako %lu lerroa %s iturburu-zerrendan (dist absolutua)"
-
-#~ msgid "Vendor block %s is invalid"
-#~ msgstr "%s hornitzaile-blokea ez da baliozkoa"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr ""
-#~ "'%1$s' hornitzaile-id ezezaguna %3$s iturburu-zerrendako %2$u lerroan"
-
-#~ msgid "File Not Found"
-#~ msgstr "Ez da fitxategia aurkitu"
diff --git a/po/fr.po b/po/fr.po
index 661c9a252..6fe746928 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,3 +1,4 @@
+# translation of fr.po to French
 # Advanced Package Transfer - APT message translation catalog
 # French messages
 # Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
@@ -5,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: apt\n"
+"Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-09-22 23:30+0200\n"
+"PO-Revision-Date: 2005-09-23 08:37+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -300,8 +301,7 @@ msgstr "Impossible d'écrire sur %s"
 
 #: cmdline/apt-extracttemplates.cc:310
 msgid "Cannot get debconf version. Is debconf installed?"
-msgstr ""
-"Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
+msgstr "Impossible d'obtenir la version de debconf. Est-ce que debconf est installé ?"
 
 #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
 msgid "Package extension list is too long"
@@ -417,8 +417,7 @@ msgstr "Aucune sélection ne correspond"
 #: ftparchive/apt-ftparchive.cc:835
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr ""
-"Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
+msgstr "Quelques fichiers sont manquants dans le groupe de fichiers de paquets « %s »"
 
 #: ftparchive/cachedb.cc:45
 #, c-format
@@ -784,8 +783,7 @@ msgstr "Erreur interne, « InstallPackages » appelé avec des paquets cassés."
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
-msgstr ""
-"Les paquets doivent être enlevés mais la désinstallation est désactivée."
+msgstr "Les paquets doivent être enlevés mais la désinstallation est désactivée."
 
 #: cmdline/apt-get.cc:773
 msgid "Internal error, Ordering didn't finish"
@@ -819,8 +817,7 @@ msgstr "Il est nécessaire de prendre %so dans les archives.\n"
 #: cmdline/apt-get.cc:827
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr ""
-"Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
+msgstr "Après dépaquetage, %so d'espace disque supplémentaires seront utilisés.\n"
 
 #: cmdline/apt-get.cc:830
 #, c-format
@@ -891,8 +888,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:988
 msgid "--fix-missing and media swapping is not currently supported"
-msgstr ""
-"l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
+msgstr "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 
 #: cmdline/apt-get.cc:993
 msgid "Unable to correct missing packages."
@@ -954,8 +950,7 @@ msgstr "Aucun paquet ne correspond au paquet %s"
 #: cmdline/apt-get.cc:1131
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-"La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
+msgstr "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
 
 #: cmdline/apt-get.cc:1139
 #, c-format
@@ -1009,8 +1004,7 @@ msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
 
 #: cmdline/apt-get.cc:1526
 msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
+msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 
 #: cmdline/apt-get.cc:1529
 msgid ""
@@ -1185,8 +1179,7 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 #: cmdline/apt-get.cc:2294
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
+msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
 #: cmdline/apt-get.cc:2298
 msgid "Failed to process build dependencies"
@@ -1369,8 +1362,7 @@ msgstr ""
 "seules les erreurs"
 
 #: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+msgid "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 "précédant ce message sont importantes. Veuillez les corriger et\n"
 "démarrer l'[I]nstallation une nouvelle fois."
@@ -1631,8 +1623,7 @@ msgstr "Ce n'est pas une archive DEB valide,  partie « %s » manquante"
 #: apt-inst/deb/debfile.cc:52
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
-msgstr ""
-"Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »"
+msgstr "Ce n'est pas une archive DEB valide, elle n'a pas de membre « %s » ou « %s »"
 
 #: apt-inst/deb/debfile.cc:112
 #, c-format
@@ -1735,8 +1726,7 @@ msgstr ""
 #: methods/ftp.cc:265
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
-msgstr ""
-"La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
+msgstr "La commande « %s » du script de connexion a échoué, le serveur a répondu : %s"
 
 #: methods/ftp.cc:291
 #, c-format
@@ -1773,8 +1763,7 @@ msgstr "Impossible de créer un connecteur"
 
 #: methods/ftp.cc:698
 msgid "Could not connect data socket, connection timed out"
-msgstr ""
-"Impossible de se connecter sur le port de données, délai de connexion dépassé"
+msgstr "Impossible de se connecter sur le port de données, délai de connexion dépassé"
 
 #: methods/ftp.cc:704
 msgid "Could not connect passive socket."
@@ -1906,11 +1895,10 @@ msgstr "Impossible de se connecter à %s %s :"
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr "E: liste d'arguments trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr "E: liste de paramètres trop longue pour Acquire::gpgv::Options. Abandon."
 
 #: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+msgid "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erreur interne : signature correcte, mais il est impossible de déterminer "
 "l'empreinte de la clé."
@@ -2344,14 +2332,12 @@ msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de l'URI)"
 #: apt-pkg/sourcelist.cc:98
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (distribution absolue)"
 
 #: apt-pkg/sourcelist.cc:105
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
+msgstr "Ligne %lu mal formée dans la liste des sources %s (analyse de distribution)"
 
 #: apt-pkg/sourcelist.cc:156
 #, c-format
@@ -2371,14 +2357,12 @@ msgstr "Ligne %u mal formée dans la liste des sources %s (type)"
 #: apt-pkg/sourcelist.cc:191
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
-"Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
+msgstr "Le type « %s » est inconnu sur la ligne %u dans la liste des sources %s"
 
 #: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-"Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
+msgstr "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
 
 #: apt-pkg/packagemanager.cc:402
 #, c-format
@@ -2399,8 +2383,7 @@ msgstr "Le type de fichier d'index « %s » n'est pas accepté"
 
 #: apt-pkg/algorithms.cc:241
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 "Le paquet %s doit être réinstallé, mais je ne parviens pas à trouver son "
 "archive."
@@ -2467,8 +2450,7 @@ msgstr "Impossible de localiser %s."
 
 #: apt-pkg/srcrecords.cc:48
 msgid "You must put some 'source' URIs in your sources.list"
-msgstr ""
-"Vous devez insérer quelques adresses « sources » dans votre sources.list"
+msgstr "Vous devez insérer quelques adresses « sources » dans votre sources.list"
 
 #: apt-pkg/cachefile.cc:73
 msgid "The package lists or status file could not be parsed or opened."
@@ -2542,8 +2524,7 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:210
 msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-"Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
+msgstr "Vous avez dépassé le nombre de versions que cet APT est capable de traiter."
 
 #: apt-pkg/pkgcachegen.cc:213
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2579,8 +2560,7 @@ msgstr "Assemblage des fichiers listés dans les champs Provides"
 
 #: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
 msgid "IO Error saving source cache"
-msgstr ""
-"Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
+msgstr "Erreur d'entrée/sortie lors de la sauvegarde du fichier de cache des sources"
 
 #: apt-pkg/acquire-item.cc:126
 #, c-format
@@ -2612,8 +2592,7 @@ msgstr ""
 
 #: apt-pkg/acquire-item.cc:811
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
@@ -2776,3 +2755,4 @@ msgstr "%s purgé"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
+
diff --git a/po/it.po b/po/it.po
index 42fbf626c..aee5acc04 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-03-26 00:42+0100\n"
+"PO-Revision-Date: 2005-10-05 17:38+0200\n"
 "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -324,7 +324,6 @@ msgid "Error processing contents %s"
 msgstr "Errore nell'analisi dei contents %s"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -390,8 +389,8 @@ msgstr ""
 "dell'albero. BinaryPath deve puntare alla base della ricerca \n"
 "ricorsiva e il file override devecontenere le opzioni di override. "
 "Pathprefix è\n"
-" aggiunto al campo filename se presente. Esempio di utilizzo dall'archivio "
-"debian:\n"
+" aggiunto al campo filename se presente. Esempio di utilizzo \n"
+"dall'archivio debian:\n"
 "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
 "               dists/potato/main/binary-i386/Packages \n"
 "\n"
@@ -692,7 +691,6 @@ msgid "%s (due to %s) "
 msgstr "%s (a causa di %s) "
 
 #: cmdline/apt-get.cc:544
-#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -761,7 +759,7 @@ msgstr "ATTENZIONE: i seguenti pacchetti non possono essere autenticati!"
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Avviso di autenticazione disabilitato \n"
 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "
@@ -776,18 +774,17 @@ msgid "There are problems and -y was used without --force-yes"
 msgstr "Sussistono dei problemi e -y è stata usata senza --force-yes"
 
 #: cmdline/apt-get.cc:753
-#, fuzzy
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Errore interno, InstallPackages Ú stato chiamato con un pacchetto rotto!"
+msgstr ""
+"Errore interno, InstallPackages è stato chiamato con un pacchetto rotto!"
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 msgstr "I pacchetti devono essere rimossi ma il remove è disabilitato."
 
 #: cmdline/apt-get.cc:773
-#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr "Errore interno, l'ordinamento non Ú finito"
+msgstr "Errore interno, l'ordinamento non è terminato"
 
 #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
 msgid "Unable to lock the download directory"
@@ -845,13 +842,13 @@ msgid "Yes, do as I say!"
 msgstr "SI, esegui come richiesto!"
 
 #: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
-"Si sta per compiere un'azione potenzialmente distruttiva\n"
+"Si sta per compiere un'azione potenzialmente pericolosa\n"
 "Per continuare scrivere la frase '%s' \n"
 " ?] "
 
@@ -933,9 +930,10 @@ msgid ""
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 msgstr ""
-"Il pacchetto %s non ha versioni disponibili, ma .\n"
-"Questo significa che il pacchetto è diventato obsoleto oùnè disponibile "
-"all'interno da un'altra sorgente\n"
+"Il pacchetto %s non ha versioni disponibili, ma ma è nominato da un "
+"altropacchetto.\n"
+" Questo significa che il pacchetto manca, è diventato obsoletoo è "
+"disponibile solo all'interno di un'altra sorgente\n"
 
 #: cmdline/apt-get.cc:1108
 msgid "However the following packages replace it:"
@@ -1069,7 +1067,6 @@ msgid "Done"
 msgstr "Fatto"
 
 #: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Errore interno, problem resolver ha rotto qualcosa"
 
@@ -1119,7 +1116,7 @@ msgstr "Comando di estrazione '%s' fallito.\n"
 #: cmdline/apt-get.cc:2016
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Verificare se il pacchetto 'dpkg-dev' è installato.\n"
 
 #: cmdline/apt-get.cc:2033
 #, c-format
@@ -1447,9 +1444,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "File di configurazione duplice %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
-msgstr "Scrittura del file %s fallita"
+msgstr "Impossibile scrivere il file %s"
 
 #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
 #, c-format
@@ -1667,9 +1664,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Impossibile smontare il CD-ROM in %s, potrebbe essere ancora in uso."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "File non trovato"
+msgstr "Disco non trovato"
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
@@ -1897,40 +1893,43 @@ msgstr "Impossibile connettersi a %s %s:"
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
+"E: Lista argomento da Acquire::gpgv::Options troppo lunga. Uscita in corso."
 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Errore interno: Firma corretta, ma non è stato possibile determinare il "
+"fingerprint della chiave?!"
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Almeno una firma non valida è stata trovata."
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
-#, fuzzy
 msgid "Could not execute "
-msgstr "Impossibile ottenere il lock %s"
+msgstr "Impossibile eseguire "
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " per verificare la firma (gnugp è installato?)"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Errore sconosciuto durante l'esecuzione di gpgv"
 
 #: methods/gpgv.cc:237
-#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr "I seguenti pacchetti verranno inoltre installati:"
+msgstr "Le seguenti firme non erano valide:\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Le seguenti firme non sono state verificate perchè la chiave pubblica non è "
+"disponibile:\n"
 
 #: methods/gzip.cc:57
 #, c-format
@@ -2417,7 +2416,7 @@ msgstr "Manca la directory di archivio %spartial."
 #: apt-pkg/acquire.cc:817
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Scaricamento del file %li di %li (%s rimanente)"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2430,12 +2429,11 @@ msgid "Method %s did not start correctly"
 msgstr "Il metodo %s non è partito correttamente"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
-"Cambio disco: Inserire il disco chiamato\n"
-" '%s'\n"
-"nel dispositivo '%s' e premere invio\n"
+"Per favore inserire il disco chiamato '%s' nel dispositivo '%s' e premere "
+"invio."
 
 #: apt-pkg/init.cc:119
 #, c-format
@@ -2703,54 +2701,54 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Scritti %i record con %i file mancanti e %i file senza match\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Apertura di %s in corso"
+msgstr "Preparazione di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Apertura di %s in corso"
+msgstr "Scompattamento di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Apertura del file di configurazione %s in corso"
+msgstr "Preparazione alla configurazione di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Connessione a %s in corso"
+msgstr "Configurazione di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Installato: "
+msgstr "%s Installato"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Preparazione per la rimozione di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Apertura di %s in corso"
+msgstr "Rimozione di %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Raccomanda"
+msgstr "%s rimosso"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Preparazione per la rimozione con la configurazione %s in corso"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
-msgstr ""
+msgstr "Rimosso con la configurazione %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
@@ -2785,7 +2783,7 @@ msgstr "Connessione chiusa prematuramente"
 #~ msgstr "-> '"
 
 #~ msgid "Followed conf file from "
-#~ msgstr "Si Ú seguito il file di configurazione da "
+#~ msgstr "Si Ú seguito il file di configurazione da "
 
 #~ msgid " to "
 #~ msgstr " a "
@@ -2864,7 +2862,7 @@ msgstr "Connessione chiusa prematuramente"
 
 #~ msgid ""
 #~ "Unable to locate any package files, perhaps this is not a Debian Disc"
-#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian"
+#~ msgstr "Impossibile trovare file di pacchetti, forse questo non Ú un disco Debian"
 
 #~ msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
 #~ msgstr "Si prega di dare un nome a questo disco, tipo 'Debian 2.1r1 Disk 1'"
@@ -2899,22 +2897,22 @@ msgstr "Connessione chiusa prematuramente"
 #~ msgstr ""
 #~ "Utilizzo: apt-cdrom [opzioni] comando\n"
 #~ "\n"
-#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n"
+#~ "apt-cdrom Ú un tool per aggiungere CD-ROM alla lista sorgenti di apt. Il\n"
 #~ "mount point del CDROM e l'informazione della periferica sono presi da apt."
 #~ "conf\n"
 #~ "e /etc/fstab.\n"
 #~ "\n"
 #~ "Comandi:\n"
 #~ "   add - Aggiunge un CDROM\n"
-#~ "   ident - riporta l'identità di un CDROM\n"
+#~ "   ident - riporta l'identità di un CDROM\n"
 #~ "\n"
 #~ "Opzioni:\n"
 #~ "  -h   Questo help\n"
 #~ "  -d   Mount point del CDROM\n"
 #~ "  -r   Rinomina un CDROM riconosciuto\n"
 #~ "  -m   Nessun montaggio\n"
-#~ "  -f   Modalità veloce, non controlla i file dei pacchetti\n"
-#~ "  -a   Scansione in modalità accurata\n"
+#~ "  -f   Modalità veloce, non controlla i file dei pacchetti\n"
+#~ "  -a   Scansione in modalità accurata\n"
 #~ "  -c=? Legge come configurazione il file specificato\n"
 #~ "  -o=? Imposta un'opzione di configurazione, es -o dir::cache=/tmp\n"
 #~ "Vedere fstab(5)\n"
@@ -2978,7 +2976,7 @@ msgstr "Connessione chiusa prematuramente"
 #~ "  -s=? file override per i sorgenti.\n"
 #~ "  -q    silenzioso\n"
 #~ "  -d=? Seleziona il database opzionale per la cache\n"
-#~ "  -no-delink Abilita la modalità di debug per il delink\n"
+#~ "  -no-delink Abilita la modalità di debug per il delink\n"
 #~ "  -contents  Generazione file contents di controllo\n"
 #~ "  -c=? Legge come configurazione il file specificato\n"
 #~ "  -o=? Imposta un'opzione di configurazione\n"
@@ -3005,7 +3003,7 @@ msgstr "Connessione chiusa prematuramente"
 #~ msgstr " non "
 
 #~ msgid "DSC file '%s' is too large!"
-#~ msgstr "il file DSC '%s' Ú troppo largo!"
+#~ msgstr "il file DSC '%s' Ú troppo largo!"
 
 #~ msgid "Could not find a record in the DSC '%s'"
 #~ msgstr "Impossibile trovare un campo nel DSC '%s'"
diff --git a/po/sv.po b/po/sv.po
index fae0877d3..172761955 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,20 @@
-# Advanced Package Tool - APT message translation catalog

-# Swedish messages

-# Peter Karlsson <peterk@debian.org>, 2002-2005.

-# Based on Danish messages

-# Claus Hindsgaul <claus_h@image.dk>, 2002.

-# 

+# Advanced Package Tool - APT message translation catalog
+# Swedish messages
+# Peter Karlsson <peterk@debian.org>, 2002-2005.
+# Based on Danish messages
+# Claus Hindsgaul <claus_h@image.dk>, 2002.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-09-22 23:07+0200\n"
-"PO-Revision-Date: 2005-01-15 15:30+0100\n"
-"Last-Translator: Peter Karlsson <peterk@debian.org>\n"
+"PO-Revision-Date: 2005-10-09 09:41+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
 #: cmdline/apt-cache.cc:135
 #, c-format
@@ -105,7 +105,7 @@ msgstr "\"Package\"-filer:"
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Cachen är ur synk, kan inte korsreferera en paketfil"
 
-# Prioritet följt av URI

+# Prioritet följt av URI
 #: cmdline/apt-cache.cc:1470
 #, c-format
 msgid "%4i %s\n"
@@ -324,7 +324,6 @@ msgid "Error processing contents %s"
 msgstr "Fel vid behaldning av innehållet %s"
 
 #: ftparchive/apt-ftparchive.cc:556
-#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -366,7 +365,7 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "Användning: apt-ftparchive [flaggor] kommando\n"
-"Kommandon: packages binärsökväg [åsidosättningsfill [sökvägsprefix]]\n"
+"Kommandon: packages binärsökväg [åsidosättningsfil [sökvägsprefix]]\n"
 "           sources källsökväg [åsidosättningsfil [sökvägsprefix]]\n"
 "           contents sökväg\n"
 "           release sökväg\n"
@@ -396,7 +395,7 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 "  -h    Denna hjälptext\n"
-"  --md5 Styr generering av MD5\n"
+"  --md5 Kontrollera generering av MD5\n"
 "  -s=?  Källkods-override-fil\n"
 "  -q    Tyst\n"
 "  -d=?  Väljer den valfria cachedatabasen\n"
@@ -429,7 +428,7 @@ msgstr "DB är för gammal, försöker uppgradera %s"
 msgid "Unable to open DB file %s: %s"
 msgstr "Kunde inte öppna DB-filen %s: %s"
 
-# Felmeddelande för misslyckad chdir

+# Felmeddelande för misslyckad chdir
 #: ftparchive/cachedb.cc:114
 #, c-format
 msgid "File date has changed %s"
@@ -470,7 +469,7 @@ msgstr "F: Felen gäller filen "
 msgid "Failed to resolve %s"
 msgstr "Misslyckades att slå upp %s"
 
-# ???

+# ???
 #: ftparchive/writer.cc:163
 msgid "Tree walking failed"
 msgstr "Trävandring misslyckades"
@@ -511,7 +510,7 @@ msgstr " Avlänkningsgräns på %sB nådd.\n"
 msgid "Failed to stat %s"
 msgstr "Misslyckades att ta status på %s"
 
-# Fält vid namn "Package"

+# Fält vid namn "Package"
 #: ftparchive/writer.cc:386
 msgid "Archive had no package field"
 msgstr "Arkivet har inget package-fält"
@@ -521,7 +520,7 @@ msgstr "Arkivet har inget package-fält"
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen post i override-filen\n"
 
-# parametrar: paket, ny, gammal

+# parametrar: paket, ny, gammal
 #: ftparchive/writer.cc:437 ftparchive/writer.cc:688
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
@@ -541,7 +540,7 @@ msgstr "realloc - Misslyckades att allokera minne"
 msgid "Unable to open %s"
 msgstr "Kunde inte öppna %s"
 
-# parametrar: filnamn, radnummer

+# parametrar: filnamn, radnummer
 #: ftparchive/override.cc:64 ftparchive/override.cc:170
 #, c-format
 msgid "Malformed override %s line %lu #1"
@@ -567,7 +566,7 @@ msgstr "Misslyckades att läsa override-filen %s"
 msgid "Unknown compression algorithm '%s'"
 msgstr "Okänd komprimeringsalgoritm \"%s\""
 
-# ???

+# ???
 #: ftparchive/multicompress.cc:105
 #, c-format
 msgid "Compressed output %s needs a compression set"
@@ -697,13 +696,12 @@ msgid "%s (due to %s) "
 msgstr "%s (på grund av %s) "
 
 #: cmdline/apt-get.cc:544
-#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 "VARNING: Följande systemkritiska paket kommer att tas bort\n"
-"Detta bör INTE göras såvida du inte vet precis vad du gör!"
+"Detta bör INTE göras såvida du inte vet exakt vad du gör!"
 
 #: cmdline/apt-get.cc:575
 #, c-format
@@ -764,7 +762,7 @@ msgstr "VARNING: Följande paket kunde inte autentiseras!"
 
 #: cmdline/apt-get.cc:691
 msgid "Authentication warning overridden.\n"
-msgstr ""
+msgstr "Authentiseringsvarning överkörd.\n"
 
 #: cmdline/apt-get.cc:698
 msgid "Install these packages without verification [y/N]? "
@@ -780,16 +778,15 @@ msgstr "Problem har uppstått och -y användes utan --force-yes"
 
 #: cmdline/apt-get.cc:753
 msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+msgstr "Internt fel. InstallPackages kallades upp med brutna paket!"
 
 #: cmdline/apt-get.cc:762
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Paket måste tas bort men \"Remove\" är inaktiverat."
 
 #: cmdline/apt-get.cc:773
-#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr "Internt fel när en omdirigering skulle läggas till"
+msgstr "Internt fel. Sorteringen färdigställdes inte"
 
 #: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
 msgid "Unable to lock the download directory"
@@ -802,7 +799,7 @@ msgstr "Listan över källor kunde inte läsas."
 
 #: cmdline/apt-get.cc:814
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+msgstr "Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian.org"
 
 #: cmdline/apt-get.cc:819
 #, c-format
@@ -825,9 +822,9 @@ msgid "After unpacking %sB disk space will be freed.\n"
 msgstr "Efter uppackning kommer %sB frigöras på disken.\n"
 
 #: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't determine free space in %s"
-msgstr "Du har inte tillräckligt ledigt utrymme i %s"
+msgstr "Kunde inte läsa av ledigt utrymme i %s"
 
 #: cmdline/apt-get.cc:847
 #, c-format
@@ -843,17 +840,17 @@ msgid "Yes, do as I say!"
 msgstr "Ja, gör som jag säger!"
 
 #: cmdline/apt-get.cc:866
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 "Du är på väg att göra något som kan vara skadligt\n"
-"Skriv frasen \"%s\" för att fortsätta\n"
+"Skriv frasen '%s' för att fortsätta\n"
 " ?] "
 
-# Visas då man svarar nej

+# Visas då man svarar nej
 #: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
 msgid "Abort."
 msgstr "Avbryter."
@@ -1066,9 +1063,8 @@ msgid "Done"
 msgstr "Färdig"
 
 #: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
-#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr "Internt fel, AllUpgrade förstörde något"
+msgstr "Internt fel, problemlösaren bröt sönder saker"
 
 #: cmdline/apt-get.cc:1856
 msgid "Must specify at least one package to fetch source for"
@@ -1116,7 +1112,7 @@ msgstr "Uppackningskommandot \"%s\" misslyckades.\n"
 #: cmdline/apt-get.cc:2016
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgstr "Kontrollera om paketet 'dpkg-dev' är installerat.\n"
 
 #: cmdline/apt-get.cc:2033
 #, c-format
@@ -1262,23 +1258,23 @@ msgstr ""
 "för mer information och flaggor.\n"
 "                     Denna APT har Speciella Ko-Krafter.\n"
 
-# Måste vara tre bokstäver(?)

-# "Hit" = aktuell version är fortfarande giltig

+# Måste vara tre bokstäver(?)
+# "Hit" = aktuell version är fortfarande giltig
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Bra "
 
-# "Get:" = hämtar ny version

+# "Get:" = hämtar ny version
 #: cmdline/acqprogress.cc:79
 msgid "Get:"
 msgstr "Läs:"
 
-# "Ign" = hoppar över

+# "Ign" = hoppar över
 #: cmdline/acqprogress.cc:110
 msgid "Ign "
 msgstr "Ign "
 
-# "Err" = fel vid hämtning

+# "Err" = fel vid hämtning
 #: cmdline/acqprogress.cc:114
 msgid "Err "
 msgstr "Fel "
@@ -1341,9 +1337,9 @@ msgstr "Ogiltig standardinställning!"
 msgid "Press enter to continue."
 msgstr "Tryck Enter för att fortsätta."
 
-# Note to translators: The following four messages belong together. It doesn't

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

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

+# Note to translators: The following four messages belong together. It doesn't
+# matter where sentences start, but it has to fit in just these four lines, and
+# at only 80 characters per line, if possible.
 #: dselect/install:100
 msgid "Some errors occurred while unpacking. I'm going to configure the"
 msgstr "Fel uppstod vid uppackning. Jag kommer ställa in de paket som"
@@ -1406,7 +1402,7 @@ msgstr "Arkivet är för kort"
 msgid "Failed to read the archive headers"
 msgstr "Misslyckades att läsa arkivhuvuden"
 
-# noden har inte någon länk till nästa paket

+# noden har inte någon länk till nästa paket
 #: apt-inst/filelist.cc:384
 msgid "DropNode called on still linked node"
 msgstr "DropNode anropat på olänkad nod"
@@ -1439,7 +1435,7 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Duplicerad konfigurationsfil %s/%s"
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write file %s"
 msgstr "Misslyckades att skriva filen %s"
 
@@ -1485,7 +1481,7 @@ msgstr "Misslyckades att hitta noden i sin hashkorg"
 msgid "The path is too long"
 msgstr "Sökvägen är för lång"
 
-# ???

+# ???
 #: apt-inst/extract.cc:417
 #, c-format
 msgid "Overwrite package match with no version for %s"
@@ -1533,7 +1529,7 @@ msgstr "Katalogerna info och temp måste ligga på samma filsystem"
 msgid "Reading package lists"
 msgstr "Läser paketlistor"
 
-# Felmeddelande för misslyckad chdir

+# Felmeddelande för misslyckad chdir
 #: apt-inst/deb/dpkgdb.cc:180
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
@@ -1619,7 +1615,7 @@ msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
 msgstr "Detta är inte ett giltigt DEB-arkiv, både \"%s\" och \"%s\" saknas"
 
-# chdir

+# chdir
 #: apt-inst/deb/debfile.cc:112
 #, c-format
 msgid "Couldn't change to %s"
@@ -1660,9 +1656,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används."
 
 #: methods/cdrom.cc:169
-#, fuzzy
 msgid "Disk not found."
-msgstr "Filen ej funnen"
+msgstr "Disk ej funnen."
 
 #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
@@ -1819,7 +1814,7 @@ msgstr "Datauttag (socket) fick inte svar inom tidsgräns"
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataöverföring misslyckades, servern sade \"%s\""
 
-# Statusmeddelande, byter från substantiv till verb

+# Statusmeddelande, byter från substantiv till verb
 #. Get the files information
 #: methods/ftp.cc:997
 msgid "Query"
@@ -1829,7 +1824,7 @@ msgstr "Frågar"
 msgid "Unable to invoke "
 msgstr "Kunde inte starta "
 
-# Felmeddelande för misslyckad chdir

+# Felmeddelande för misslyckad chdir
 #: methods/connect.cc:64
 #, c-format
 msgid "Connecting to %s (%s)"
@@ -1840,7 +1835,7 @@ msgstr "Ansluter till %s (%s)"
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
-# [f]amilj, [t]yp, [p]rotokoll

+# [f]amilj, [t]yp, [p]rotokoll
 #: methods/connect.cc:80
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
@@ -1878,7 +1873,7 @@ msgstr "Kunde inte slå upp \"%s\""
 msgid "Temporary failure resolving '%s'"
 msgstr "Temporärt fel vid uppslagning av \"%s\""
 
-# Okänd felkod; %i = koden

+# Okänd felkod; %i = koden
 #: methods/connect.cc:174
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
@@ -1891,48 +1886,48 @@ msgstr "Kunde inte ansluta till %s %s:"
 
 #: methods/gpgv.cc:92
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
+msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar."
 
 #: methods/gpgv.cc:191
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
+"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
 
 #: methods/gpgv.cc:196
 msgid "At least one invalid signature was encountered."
-msgstr ""
+msgstr "Åtminstone en giltig signatur träffades på."
 
 #. FIXME String concatenation considered harmful.
 #: methods/gpgv.cc:201
-#, fuzzy
 msgid "Could not execute "
-msgstr "Kunde inte erhålla låset %s"
+msgstr "Kunde inte exekvera "
 
 #: methods/gpgv.cc:202
 msgid " to verify signature (is gnupg installed?)"
-msgstr ""
+msgstr " för att verifiera signature (är gnupg installerad?)"
 
 #: methods/gpgv.cc:206
 msgid "Unknown error executing gpgv"
-msgstr ""
+msgstr "Okänt fel vid exekvering av gpgv"
 
 #: methods/gpgv.cc:237
-#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr "Följande ytterligare paket kommer att installeras:"
+msgstr "Följande signaturer är ogiltiga:\n"
 
 #: methods/gpgv.cc:244
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
+"Följande signaturer kunde inte verifieras för att den publika nyckeln inte är tillgänglig:\n"
 
 #: methods/gzip.cc:57
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Kunde inte öppna rör för %s"
 
-# %s = programnamn

+# %s = programnamn
 #: methods/gzip.cc:102
 #, c-format
 msgid "Read error from %s process"
@@ -2141,7 +2136,7 @@ msgstr "Felaktig operation %s"
 msgid "Unable to stat the mount point %s"
 msgstr "Kunde inte ta status på monteringspunkt %s."
 
-# Felmeddelande för misslyckad chdir

+# Felmeddelande för misslyckad chdir
 #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
 #, c-format
 msgid "Unable to change to %s"
@@ -2218,7 +2213,7 @@ msgstr "Problem med att länka ut filen"
 msgid "Problem syncing the file"
 msgstr "Problem med att synka filen"
 
-# Felmeddelande

+# Felmeddelande
 #: apt-pkg/pkgcache.cc:126
 msgid "Empty package cache"
 msgstr "Paketcachen är tom"
@@ -2256,7 +2251,7 @@ msgstr "Föreslår"
 msgid "Recommends"
 msgstr "Rekommenderar"
 
-# "Konfliktar"?

+# "Konfliktar"?
 #: apt-pkg/pkgcache.cc:219
 msgid "Conflicts"
 msgstr "I konflikt med"
@@ -2265,7 +2260,7 @@ msgstr "I konflikt med"
 msgid "Replaces"
 msgstr "Ersätter"
 
-# "Föråldrar"?

+# "Föråldrar"?
 #: apt-pkg/pkgcache.cc:220
 msgid "Obsoletes"
 msgstr "Gör föråldrad"
@@ -2411,7 +2406,7 @@ msgstr "Arkivkatalogen %spartial saknas."
 #: apt-pkg/acquire.cc:817
 #, c-format
 msgid "Downloading file %li of %li (%s remaining)"
-msgstr ""
+msgstr "Laddar ner fil %li av %li (%s återstår)"
 
 #: apt-pkg/acquire-worker.cc:113
 #, c-format
@@ -2424,19 +2419,16 @@ msgid "Method %s did not start correctly"
 msgstr "Metoden %s startade inte korrekt"
 
 #: apt-pkg/acquire-worker.cc:377
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Mediabyte: Sätt i disken med etiketten\n"
-" \"%s\"\n"
-"i enhet \"%s\" och tryck Enter\n"
+msgstr "Mata in disken med etiketten '%s' i enheten '%s' och tryck Enter."
 
 #: apt-pkg/init.cc:119
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Paketsystemet \"%s\" stöds inte"
 
-# 

+# 
 #: apt-pkg/init.cc:135
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Kunde inte avgöra en lämpligt paketsystemstyp"
@@ -2458,7 +2450,7 @@ msgstr "Paketlistan eller statusfilen kunde inte tolkas eller öppnas."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Du kan möjligen rätta problemet genom att köra \"apt-get update\""
 
-# "Package" är en sträng i inställningsfilen

+# "Package" är en sträng i inställningsfilen
 #: apt-pkg/policy.cc:269
 msgid "Invalid record in the preferences file, no Package header"
 msgstr "Ogiltig post i inställningsfilen, \"Package\"-huvud saknas"
@@ -2476,7 +2468,7 @@ msgstr "Prioritet ej angiven (eller noll) för nål"
 msgid "Cache has an incompatible versioning system"
 msgstr "Cachen har ett inkompatibelt versionssystem"
 
-# NewPackage etc. är funktionsnamn

+# NewPackage etc. är funktionsnamn
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 msgid "Error occurred while processing %s (NewPackage)"
@@ -2524,7 +2516,7 @@ msgstr "Grattis, du överskred antalet versioner denna APT kan hantera."
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "Grattis, du överskred antalet beroenden denna APT kan hantera."
 
-# NewPackage etc. är funktionsnamn

+# NewPackage etc. är funktionsnamn
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
@@ -2690,71 +2682,71 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n"
 
 #: apt-pkg/deb/dpkgpm.cc:358
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing %s"
-msgstr "Öppnar %s"
+msgstr "Förbereder %s"
 
 #: apt-pkg/deb/dpkgpm.cc:359
-#, fuzzy, c-format
+#, c-format
 msgid "Unpacking %s"
-msgstr "Öppnar %s"
+msgstr "Packar upp %s"
 
 #: apt-pkg/deb/dpkgpm.cc:364
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing to configure %s"
-msgstr "Öppnar konfigurationsfil %s"
+msgstr "Förbereder konfigurering av %s"
 
 #: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
+#, c-format
 msgid "Configuring %s"
-msgstr "Ansluter till %s"
+msgstr "Konfigurerar %s"
 
 #: apt-pkg/deb/dpkgpm.cc:366
-#, fuzzy, c-format
+#, c-format
 msgid "Installed %s"
-msgstr "  Installerad: "
+msgstr "Installerade %s"
 
 #: apt-pkg/deb/dpkgpm.cc:371
 #, c-format
 msgid "Preparing for removal of %s"
-msgstr ""
+msgstr "Förbereder för borttagning av %s"
 
 #: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
+#, c-format
 msgid "Removing %s"
-msgstr "Öppnar %s"
+msgstr "Tar bort %s"
 
 #: apt-pkg/deb/dpkgpm.cc:373
-#, fuzzy, c-format
+#, c-format
 msgid "Removed %s"
-msgstr "Rekommenderar"
+msgstr "Tog bort %s"
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 msgid "Preparing for remove with config %s"
-msgstr ""
+msgstr "Förbereder för borttagning med konfiguration %s"
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgid "Removed with config %s"
-msgstr ""
+msgstr "Borttagen med konfiguration %s"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Förbindelsen stängdes i förtid"
 
 #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s"
+#~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s"
 
 #~ msgid ""
 #~ "Some broken packages were found while trying to process build-"
 #~ "dependencies.\n"
 #~ "You might want to run `apt-get -f install' to correct these."
 #~ msgstr ""
-#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan möjligen\n"
-#~ "rätta detta genom att köra \"apt-get -f install\"."
+#~ "Trasiga paket hittades när byggberoenden behandlades. Du kan möjligen\n"
+#~ "rätta detta genom att köra \"apt-get -f install\"."
 
 #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
 #~ msgstr ""
-#~ "Beklagar, men du har inte tillräckligt ledigt utrymme på %s för att lagra "
-#~ "alla .deb-filerna."
+#~ "Beklagar, men du har inte tillräckligt ledigt utrymme på %s för att "
+#~ "lagra alla .deb-filerna."