* star-merged with apt--mvo

Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-133 Merge with Michael AND update PO files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102 * finalized this release * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104 * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107 * merged with bubulle
author: Michael Vogt <michael.vogt@ubuntu.com> 2005-12-08 18:07:48 +0000
committer: Michael Vogt <michael.vogt@ubuntu.com> 2005-12-08 18:07:48 +0000
commit: fc25afd0b3fbe47a9ded2978142dadafe52a989b (patch)
tree: 6604b7df797e34ad2347c00d7b727c3b943127d8
parent: 193593331d2833dbc640f3bb1ad3dd6bfaac858f (diff)
parent: b7475c1ea32e60fca03b7092bfe7ee3fd3dfde47 (diff)
35 files changed, 354 insertions, 366 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index db895a6c1..e3b4d94f8 100644
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -241,7 +241,7 @@ bool pkgSourceList::ReadAppend(string File)
 
       Type *Parse = Type::GetType(LineType.c_str());
       if (Parse == 0)
-	 return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
+	 return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
       
       // Vendor name specified
       if (C[0] == '[')
diff --git a/debian/changelog b/debian/changelog
index d57825909..2061f8125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ apt (0.6.43ubuntu1) dapper; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:36:29 +0100
 
-apt (0.6.43) unstable; urgency=low
+apt (0.6.43) unstable; urgency=medium
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:  
     * zh_CN.po: Completed to 510 strings(Closes: #338267)
@@ -25,7 +25,11 @@ apt (0.6.43) unstable; urgency=low
   * support a download rate limit for http (closes: #146877)
   * included lots of the speedup changes from #319377
   * add stdint.h to contrib/md5.h (closes: #340448)
+  * ABI change, library name changed (closes: #339147)
+  * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
+  * switch to libdb4.3 in build-depends
   
+<<<<<<< TREE
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:22:31 +0100
 
 apt (0.6.42.3ubuntu2) dapper; urgency=low
@@ -43,6 +47,9 @@ apt (0.6.42.3ubuntu1) dapper; urgency=low
   * synced with debian
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2005 05:05:56 +0100
+=======
+ -- Michael Vogt <mvo@debian.org>  Tue, 29 Nov 2005 00:17:07 +0100
+>>>>>>> MERGE-SOURCE
 
 apt (0.6.42.3) unstable; urgency=low
 
diff --git a/methods/http.cc b/methods/http.cc
index d308d72b0..dc3f0b763 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -827,7 +827,7 @@ bool HttpMethod::Flush(ServerState *Srv)
       // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking
       // can't be set
       if (File->Name() != "/dev/null")
-        SetNonBlock(File->Fd(),false);
+	 SetNonBlock(File->Fd(),false);
       if (Srv->In.WriteSpace() == false)
 	 return true;
       
@@ -858,7 +858,7 @@ bool HttpMethod::ServerDie(ServerState *Srv)
       // on GNU/kFreeBSD, apt dies on /dev/null because non-blocking
       // can't be set
       if (File->Name() != "/dev/null")
-        SetNonBlock(File->Fd(),false);
+	 SetNonBlock(File->Fd(),false);
       while (Srv->In.WriteSpace() == true)
       {
 	 if (Srv->In.Write(File->Fd()) == false)
diff --git a/po/ChangeLog b/po/ChangeLog
index 830f746eb..e2e705c12 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29   Christian Perrier  <bubulle@debian.org>
+
+	* fr.po: Completed to 510 strings
+	* *.po : Synced with the POT files
+
 2005-11-14   Kov Tchai  <tchaikov@sjtu.edu.cn>
 
 	* zh_CN.po: Completed to 510 strings
diff --git a/po/apt-all.pot b/po/apt-all.pot
index ffd5f03cd..311549b4f 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1609,7 +1609,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1784,31 +1784,31 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr ""
 
@@ -2151,7 +2151,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:244
 #, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/bs.po b/po/bs.po
index 889316194..0cb31f3e8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -1627,7 +1627,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1803,31 +1803,31 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
@@ -2171,7 +2171,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:244
 #, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/ca.po b/po/ca.po
index db478c783..b0b35e935 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-07-19 01:31+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1817,7 +1817,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1998,31 +1998,31 @@ msgstr "Connexió finalitzada"
 msgid "Error writing to output file"
 msgstr "Error escrivint en el fitxer d'eixida"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Error escrivint en el fitxer"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Error escrivint en el fitxer"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error llegint, el servidor remot ha tancat la connexió"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Error llegint des del servidor"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Error intern"
 
@@ -2365,7 +2365,7 @@ msgstr "La línia %u és malformada en la llista de fonts %s (tipus)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/cs.po b/po/cs.po
index 732b33f41..e782cd293 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-11 16:14+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"
@@ -1793,7 +1793,7 @@ msgstr "Spojení datového socketu vypršelo"
 msgid "Unable to accept connection"
 msgstr "Nemohu přijmout spojení"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
@@ -1970,31 +1970,31 @@ msgstr "Čas spojení vypršel"
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
@@ -2338,7 +2338,7 @@ msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ '%s' na řádce %u v seznamu zdrojů %s není známý"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/da.po b/po/da.po
index 3886c18c1..b43f81e8f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-11-07 15:28+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1799,7 +1799,7 @@ msgstr "Tidsudl�b p� datasokkel-forbindelse"
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1978,31 +1978,31 @@ msgstr "Tidsudl�b p� forbindelsen"
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved l�sning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Fejl ved l�sning fra server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Intern fejl"
 
@@ -2345,7 +2345,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen '%s' er ukendt p� linje %u i kildelisten %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/de.po b/po/de.po
index 0b6dfd3f4..784328894 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-06-15 18:22+0200\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team:  <de@li.org>\n"
@@ -1837,7 +1837,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
 msgid "Unable to accept connection"
 msgstr "Kann Verbindung nicht annehmen"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 
@@ -2015,33 +2015,33 @@ msgstr "Verbindung erlitt Zeitüberschreitung"
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben einer Ausgabedatei"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben einer Datei"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Das entfernte Ende hat die Verbindung "
 "geschlossen"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -2385,7 +2385,7 @@ msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/el.po b/po/el.po
index b1b749377..f908c0fa5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-07-14 14:25EEST\n"
 "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
 "org>\n"
@@ -1832,7 +1832,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο�
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
@@ -2009,32 +2009,32 @@ msgstr "Λήξη χρόνου σύνδεσης"
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
@@ -2382,7 +2382,7 @@ msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγ�
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/en_GB.po b/po/en_GB.po
index 8e78fd1db..f9260d8b9 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2002-11-10 20:56+0100\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: en_GB <en@li.org>\n"
@@ -1663,7 +1663,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1839,31 +1839,31 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr ""
 
@@ -2206,7 +2206,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type ‘%s’ is not known in on line %u in source list %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/es.po b/po/es.po
index 660505f2c..15a376a06 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-08 20:36+0100\n"
 "Last-Translator: Rub�n Porras Campo <nahoo@inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1822,7 +1822,7 @@ msgstr "Expir� conexi�n a socket de datos"
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexi�n"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
@@ -1999,31 +1999,31 @@ msgstr "Expir� la conexi�n"
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerr� la conexi�n."
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Fallo la conexi�n"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -2370,7 +2370,7 @@ msgstr "L�nea %u mal formada en lista de fuentes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' desconocido en la l�nea %u de lista de fuentes %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/eu.po b/po/eu.po
index 6b4f774a6..3eefeee2b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-11-07 22:37+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: librezale.org <librezale@librezale.org>\n"
@@ -1802,7 +1802,7 @@ msgstr "Datu-socket konexioak denbora-muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1980,31 +1980,31 @@ msgstr "Konexioaren denbora-muga gainditu da"
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Barne-errorea"
 
@@ -2351,7 +2351,7 @@ msgstr "Gaizki osatutako %u lerroa %s iturburu-zerrendan (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "'%1$s' mota ez da ezagutzen %3$s iturburu-zerrendako %2$u lerroan"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/fi.po b/po/fi.po
index 0fafcc375..0afdf5879 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-15 14:09+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -1804,7 +1804,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1981,31 +1981,31 @@ msgstr "Yhteys aikakatkaistiin"
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
@@ -2348,7 +2348,7 @@ msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/fr.po b/po/fr.po
index d0dcd7aa3..e1858e330 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
-"PO-Revision-Date: 2005-11-01 18:16+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
+"PO-Revision-Date: 2005-11-30 08:56+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -235,13 +235,11 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:78
 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
-"Veuillez indiquer le nom de ce disque, par exemple ��Debian 2.1r1 Disk 1��"
+msgstr "Veuillez indiquer le nom de ce disque, par exemple ��Debian 2.1r1 Disk 1��"
 
 #: cmdline/apt-cdrom.cc:93
 msgid "Please insert a Disc in the drive and press enter"
-msgstr ""
-"Veuillez ins�rer un disque dans le lecteur et appuyez sur la touche Entr�e"
+msgstr "Veuillez ins�rer un disque dans le lecteur et appuyez sur la touche Entr�e"
 
 #: cmdline/apt-cdrom.cc:117
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -317,8 +315,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"
@@ -434,8 +431,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
@@ -801,8 +797,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"
@@ -836,8 +831,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
@@ -908,8 +902,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."
@@ -971,8 +964,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
@@ -1026,8 +1018,7 @@ msgstr "Note, s�lectionne %s pour l'expression rationnelle ��%s��\n"
 
 #: cmdline/apt-get.cc:1553
 msgid "You might want to run `apt-get -f install' to correct these:"
-msgstr ""
-"Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
+msgstr "Vous pouvez lancer ��apt-get -f install�� pour corriger ces probl�mes�:"
 
 #: cmdline/apt-get.cc:1556
 msgid ""
@@ -1202,8 +1193,7 @@ msgstr "Impossible de satisfaire les d�pendances %s pour %s�: %s"
 #: cmdline/apt-get.cc:2321
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr ""
-"Les d�pendances de compilation pour %s ne peuvent pas �tre satisfaites."
+msgstr "Les d�pendances de compilation pour %s ne peuvent pas �tre satisfaites."
 
 #: cmdline/apt-get.cc:2325
 msgid "Failed to process build dependencies"
@@ -1386,8 +1376,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."
@@ -1649,8 +1638,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
@@ -1753,8 +1741,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
@@ -1791,8 +1778,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."
@@ -1836,7 +1822,7 @@ msgstr "D�lai de connexion au port de donn�es d�pass�"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probl�me de hachage du fichier"
 
@@ -1924,12 +1910,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 de param�tres trop longue pour Acquire::gpgv::Options. Abandon."
+msgstr "E: liste de param�tres trop longue pour Acquire::gpgv::Options. Abandon."
 
 #: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+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�."
@@ -2018,31 +2002,31 @@ msgstr "D�lai de connexion d�pass�"
 msgid "Error writing to output file"
 msgstr "Erreur d'�criture du fichier de sortie"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Erreur d'�criture sur un fichier"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Erreur d'�criture sur le fichier"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erreur de lecture depuis le serveur distant et cl�ture de la connexion"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Mauvais en-t�te de donn�e"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "�chec de la connexion"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -2363,14 +2347,12 @@ msgstr "Ligne %lu mal form�e dans la liste des sources %s (analyse de l'URI)"
 #: apt-pkg/sourcelist.cc:105
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
-"Ligne %lu mal form�e dans la liste des sources %s (distribution absolue)"
+msgstr "Ligne %lu mal form�e dans la liste des sources %s (distribution absolue)"
 
 #: apt-pkg/sourcelist.cc:112
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Ligne %lu mal form�e dans la liste des sources %s (analyse de distribution)"
+msgstr "Ligne %lu mal form�e dans la liste des sources %s (analyse de distribution)"
 
 #: apt-pkg/sourcelist.cc:203
 #, c-format
@@ -2388,16 +2370,14 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Ligne %u mal form�e dans la liste des sources %s (type)"
 
 #: apt-pkg/sourcelist.cc:244
-#, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
-msgstr ""
-"Le type ��%s�� est inconnu sur la ligne %u dans la liste des sources %s"
+#, 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"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
-msgstr ""
-"Ligne %u mal form�e dans la liste des sources %s (identifiant du fournisseur)"
+msgstr "Ligne %u mal form�e dans la liste des sources %s (identifiant du fournisseur)"
 
 #: apt-pkg/packagemanager.cc:402
 #, c-format
@@ -2418,8 +2398,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."
@@ -2486,8 +2465,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."
@@ -2561,8 +2539,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."
@@ -2598,8 +2575,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
@@ -2631,8 +2607,7 @@ msgstr ""
 
 #: apt-pkg/acquire-item.cc:814
 #, 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."
@@ -2795,3 +2770,4 @@ msgstr "%s purg�"
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connexion ferm�e pr�matur�ment"
+
diff --git a/po/he.po b/po/he.po
index 570e0ee93..494900c05 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2004-06-10 19:58+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew\n"
@@ -1616,7 +1616,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1792,31 +1792,31 @@ msgstr ""
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr ""
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr ""
 
@@ -2159,7 +2159,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:244
 #, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/hu.po b/po/hu.po
index e62e5e651..5a07e14b5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-15 18:03+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -1811,7 +1811,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet"
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
@@ -1988,31 +1988,31 @@ msgstr "Időtúllépés a kapcsolatban"
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Hiba fájl írásakor"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Kapcsolódás sikertelen"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Belső hiba"
 
@@ -2357,7 +2357,7 @@ msgstr "A(z) %u. sor hibás %s forráslistában (típus)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/it.po b/po/it.po
index 99e576c1f..0aa71cf43 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+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"
@@ -1818,7 +1818,7 @@ msgstr "Tempo limite di connessione esaurito per il socket dati"
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problemi nella creazione dell'hash del file"
 
@@ -1999,32 +1999,32 @@ msgstr "Tempo limite per la connessione esaurito"
 msgid "Error writing to output file"
 msgstr "Errore nella scrittura del file di output"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Errore nella scrittura nel file"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Errore nella scrittura nel file"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Errore nella lettura dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Errore nella lettura dal server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Header dei dati malformato"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -2372,7 +2372,7 @@ msgstr "La linea %u in %s (type) non � corretta"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Il tipo '%s' non � riconosciuto alla linea %u nella lista sorgente %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/ja.po b/po/ja.po
index 5999f497f..59b092bfa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-09 12:54+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -1814,7 +1814,7 @@ msgstr "�ǡ��������å���³�����ॢ����"
 msgid "Unable to accept connection"
 msgstr "��³�� accept �Ǥ��ޤ���"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "�ե�����Υϥå���Ǥ�����"
 
@@ -1991,31 +1991,31 @@ msgstr "��³�����ॢ����"
 msgid "Error writing to output file"
 msgstr "���ϥե�����ؤν񤭹��ߤǥ��顼��ȯ�����ޤ���"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "�ե�����ؤν񤭹��ߤǥ��顼��ȯ�����ޤ���"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "�ե�����ؤν񤭹��ߤǥ��顼��ȯ�����ޤ���"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "��⡼��¦����³��������������ƥ����Ф�����ɤ߹��ߤ˼��Ԥ��ޤ���"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "�����Ф�����ɤ߹��ߤ˼��Ԥ��ޤ���"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "�����ʥإå��Ǥ�"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "��³����"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "�������顼"
 
@@ -2358,7 +2358,7 @@ msgstr "�������ꥹ�� %2$s �� %1$u ���ܤ������Ǥ� (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "�������ꥹ�� %3$s �� %2$u �Ԥˤ��륿���� '%1$s' �������Ǥ�"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/ko.po b/po/ko.po
index bf7c64df2..7f6636c8f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-10 21:56+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"
@@ -1802,7 +1802,7 @@ msgstr "데이터 소켓 연결 시간 초과"
 msgid "Unable to accept connection"
 msgstr "연결을 받을 수 없습니다"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "파일 해싱에 문제가 있습니다"
 
@@ -1979,31 +1979,31 @@ msgstr "연결 시간이 초과했습니다"
 msgid "Error writing to output file"
 msgstr "출력 파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "해당 파일에 쓰는 데 오류가 발생했습니다"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "서버에서 읽는 데 오류가 발생했습니다"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "헤더 데이터가 잘못되었습니다"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "연결이 실패했습니다"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "내부 오류"
 
@@ -2346,7 +2346,7 @@ msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "소스 리스트 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/nb.po b/po/nb.po
index d2a2ea08b..a7be002f5 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-09 10:45+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.ui.no>\n"
@@ -1823,7 +1823,7 @@ msgstr "Tidsavbrudd p� tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke � godta tilkoblingen"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
@@ -2000,31 +2000,31 @@ msgstr "Tidsavbrudd p� forbindelsen"
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Feil ved lesing fra tjeneren"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "�delagte hodedata"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2367,7 +2367,7 @@ msgstr "Feil p� %u i kildelista %s (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen �%s� er ukjent i linje %u i kildelista %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/nl.po b/po/nl.po
index adb5a01ed..c69254389 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-10 17:35+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -1831,7 +1831,7 @@ msgstr "Datasocket verbinding is verlopen"
 msgid "Unable to accept connection"
 msgstr "Kan de verbinding niet aanvaarden"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probleem bij het hashen van het bestand"
 
@@ -2010,32 +2010,32 @@ msgstr "Verbinding verliep"
 msgid "Error writing to output file"
 msgstr "Fout bij het schrijven naar het uitvoerbestand"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Fout bij het schrijven naar bestand"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Fout bij het schrijven naar het bestand"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Fout bij het lezen van de server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Foute koptekstdata"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Interne fout"
 
@@ -2385,7 +2385,7 @@ msgstr "Misvormde regel %u in bronlijst %s (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type '%s' is onbekend op regel %u in bronlijst %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/nn.po b/po/nn.po
index 2af28c5b4..55c044cbe 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: H�vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1806,7 +1806,7 @@ msgstr "Tidsavbrot p� tilkopling til datasokkel"
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av n�kkel for fil"
 
@@ -1983,31 +1983,31 @@ msgstr "Tidsavbrot p� sambandet"
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing fr� tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Feil ved lesing fr� tenaren"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "�ydelagde hovuddata"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2350,7 +2350,7 @@ msgstr "Misforma linje %u i kjeldelista %s (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen �%s� er ukjend i linja %u i kjeldelista %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/pl.po b/po/pl.po
index 4676dd45f..230a50e73 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-11 11:47+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -1816,7 +1816,7 @@ msgstr "Przekroczony czas po��czenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie uda�o si� przyj�� po��czenia"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Nie uda�o si� obliczy� skr�tu pliku"
 
@@ -1993,31 +1993,31 @@ msgstr "Przekroczenie czasu po��czenia"
 msgid "Error writing to output file"
 msgstr "B��d przy pisaniu do pliku wyj�ciowego"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "B��d przy pisaniu do pliku"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "B��d przy pisaniu do pliku"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "B��d czytania z serwera: Zdalna strona zamkn�a po��czenie"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "B��d czytania z serwera"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "B��dne dane nag��wka"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Po��czenie nie uda�o si�"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "B��d wewn�trzny"
 
@@ -2361,7 +2361,7 @@ msgstr "Nieprawid�owa linia %u w li�cie �r�de� %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ '%s' jest nieznany - linia %u listy �r�de� %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/pt.po b/po/pt.po
index af1b7802c..7ece08e33 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-03-07 22:20+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1813,7 +1813,7 @@ msgstr "Ligação de socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Impossível aceitar ligação"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema fazendo o hash do ficheiro"
 
@@ -1990,31 +1990,31 @@ msgstr "A ligação expirou"
 msgid "Error writing to output file"
 msgstr "Erro gravando para ficheiro de saída"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Erro gravando para ficheiro"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Erro gravando para o ficheiro"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Falhou a ligação"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2359,7 +2359,7 @@ msgstr "Linha malformada %u na lista de fontes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1e9fb41b3..91113c684 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-06-16 10:24-0300\n"
 "Last-Translator: Andr� Lu�s Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1813,7 +1813,7 @@ msgstr "Conex�o do socket de dados expirou"
 msgid "Unable to accept connection"
 msgstr "Imposs�vel aceitar conex�o"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema fazendo o hash do arquivo"
 
@@ -1990,31 +1990,31 @@ msgstr "Conex�o expirou"
 msgid "Error writing to output file"
 msgstr "Erro gravando para arquivo de sa�da"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Erro gravando para arquivo"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Erro gravando para o arquivo"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor Ponto remoto fechou a conex�o"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Dados de cabe�alho ruins"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Conex�o falhou."
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2359,7 +2359,7 @@ msgstr "Linha malformada %u no arquivo de fontes %s (tipo)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipo '%s' n�o � conhecido na linha %u na lista de fontes %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/ro.po b/po/ro.po
index 678ec452b..338f65965 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_ro\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-08-25 17:43+0300\n"
 "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
 "Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"
@@ -1821,7 +1821,7 @@ msgstr "Timp de conectare data socket expirat"
 msgid "Unable to accept connection"
 msgstr "Nu pot accepta conexiune"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problemă la indexarea fişierului"
 
@@ -1998,32 +1998,32 @@ msgstr "Timp de conectare expirat"
 msgid "Error writing to output file"
 msgstr "Eroare la scrierea fişierului de rezultat"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Eroare la scrierea în fişier"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Eroare la scrierea în fişierul"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Eroare la citirea de pe server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Antet de date necorespunzător"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Conectare eşuată"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Eroare internă"
 
@@ -2368,7 +2368,7 @@ msgstr "Linie greşită %u în lista sursă %s (tip)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/ru.po b/po/ru.po
index e15923d3d..9e874e6c0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-10-22 12:24+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1833,7 +1833,7 @@ msgstr "Время установления соединения для соке
 msgid "Unable to accept connection"
 msgstr "Невозможно принять соединение"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Проблема при хэшировании файла"
 
@@ -2014,31 +2014,31 @@ msgstr "Время ожидания для соединения истекло"
 msgid "Error writing to output file"
 msgstr "Ошибка записи в выходной файл"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Ошибка записи в файл"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Ошибка чтения, удалённый сервер прервал соединение"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Ошибка чтения с сервера"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Неверный заголовок данных"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Соединение разорвано"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
@@ -2390,7 +2390,7 @@ msgstr "Искажённая строка %u в списке источнико�
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Неизвестен тип '%s' в строке %u в списке источников %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/sk.po b/po/sk.po
index 9b3499899..38f3977f5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-07-01 09:34+0200\n"
 "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1797,7 +1797,7 @@ msgstr "Uplynulo spojenie dátového socketu"
 msgid "Unable to accept connection"
 msgstr "Spojenie sa nedá prijať"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hashovaním súboru"
 
@@ -1974,31 +1974,31 @@ msgstr "Uplynul čas spojenia"
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupného súboru"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do súboru"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba pri čítaní zo servera. Druhá strana ukončila spojenie"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Chyba pri čítaní zo servera"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Zlé dátové záhlavie"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
@@ -2342,7 +2342,7 @@ msgstr "Skomolený riadok %u v zozname zdrojov %s (typ)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typ '%s' je neznámy na riadku %u v zozname zdrojov %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/sl.po b/po/sl.po
index 1fb62b0d1..0e824b034 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-16 22:18+0100\n"
 "Last-Translator: Jure �uhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1796,7 +1796,7 @@ msgstr "Povezava podatkovne vti�nice potekla"
 msgid "Unable to accept connection"
 msgstr "Ni mogo�e sprejeti povezave"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Te�ava pri razpr�evanju datoteke"
 
@@ -1973,31 +1973,31 @@ msgstr "�as za povezavo se je iztekel"
 msgid "Error writing to output file"
 msgstr "Napaka pri pisanju v izhodno datoteko"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Napaka pri pisanju v datoteko"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Napaka pri pisanju v datoteko"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Napaka pri branju oddaljene in zaprte povezave s stre�nika "
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Napaka pri branju s stre�nika"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Napa�ni podatki glave"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Povezava ni uspela"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Notranja napaka"
 
@@ -2341,7 +2341,7 @@ msgstr "Napa�na vrstica %u v seznamu virov %s (vrsta)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/sv.po b/po/sv.po
index 5b8e8e25f..b069c929c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-11-02 23:56+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1809,7 +1809,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr�ns"
 msgid "Unable to accept connection"
 msgstr "Kunde inte ta emot anslutning"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem med att l�gga filen till hashtabellen"
 
@@ -1992,31 +1992,31 @@ msgstr "Tidsgr�nsen f�r anslutningen n�ddes"
 msgid "Error writing to output file"
 msgstr "Fel vid skrivning till utdatafil"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Fel vid skrivning till fil"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Fel vid skrivning till filen"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fel vid l�sning fr�n server: Andra �nden st�ngde f�rbindelsen"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Fel vid l�sning fr�n server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Trasigt data i huvud"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Anslutning misslyckades"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Internt fel"
 
@@ -2363,7 +2363,7 @@ msgstr "Rad %u i k�llistan %s har fel format (typ)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen \"%s\" �r ok�nd p� rad %u i k�llistan %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/tl.po b/po/tl.po
index 32fe10795..3aa99c31b 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-11-03 03:35+0800\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1814,7 +1814,7 @@ msgstr "Nag-timeout ang socket ng datos"
 msgid "Unable to accept connection"
 msgstr "Hindi makatanggap ng koneksyon"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema sa pag-hash ng talaksan"
 
@@ -1995,31 +1995,31 @@ msgstr "Nag-timeout ang koneksyon"
 msgid "Error writing to output file"
 msgstr "Error sa pagsulat ng talaksang output"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "Error sa pagsulat sa talaksan"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "Error sa pagsusulat sa talaksan"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "Error sa pagbasa mula sa server"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "Maling datos sa header"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "Bigo ang koneksyon"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "Internal na error"
 
@@ -2368,7 +2368,7 @@ msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Di kilalang uri '%s' sa linyang %u sa talaksang pagkukunan %s"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ecf15e24..34cfbb679 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-11-15 00:05+0800\n"
 "Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@ -1778,7 +1778,7 @@ msgstr "数据套接字连接超时"
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "把文件加入散列表时出错"
 
@@ -1953,31 +1953,31 @@ msgstr "连接服务器超时"
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "写文件时出错"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "错误的报头数据"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "内部错误"
 
@@ -2320,7 +2320,7 @@ msgstr "在安装源列表中 %2$s 中第 %1$u 行的格式有误 (type)"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "无法识别在安装源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
diff --git a/po/zh_TW.po b/po/zh_TW.po
index eb278a238..4d8082214 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.5.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-08 18:35+0100\n"
+"POT-Creation-Date: 2005-11-30 08:37+0100\n"
 "PO-Revision-Date: 2005-02-19 22:24+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -1789,7 +1789,7 @@ msgstr "Data socket 連線逾時"
 msgid "Unable to accept connection"
 msgstr "無法允許連線"
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "問題雜湊表"
 
@@ -1966,31 +1966,31 @@ msgstr "連線逾時"
 msgid "Error writing to output file"
 msgstr "寫入輸出檔時發生錯誤"
 
-#: methods/http.cc:834
+#: methods/http.cc:837
 msgid "Error writing to file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:859
+#: methods/http.cc:865
 msgid "Error writing to the file"
 msgstr "寫入檔案時發生錯誤"
 
-#: methods/http.cc:873
+#: methods/http.cc:879
 msgid "Error reading from server. Remote end closed connection"
 msgstr "從遠端主機讀取錯誤，關閉連線"
 
-#: methods/http.cc:875
+#: methods/http.cc:881
 msgid "Error reading from server"
 msgstr "從伺服器讀取發生錯誤"
 
-#: methods/http.cc:1106
+#: methods/http.cc:1112
 msgid "Bad header data"
 msgstr "壞的標頭資料"
 
-#: methods/http.cc:1123
+#: methods/http.cc:1129
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: methods/http.cc:1214
+#: methods/http.cc:1220
 msgid "Internal error"
 msgstr "內部錯誤"
 
@@ -2333,7 +2333,7 @@ msgstr "來源檔『%2$s』第 %1$u 行有錯誤 (類別)。"
 
 #: apt-pkg/sourcelist.cc:244
 #, fuzzy, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "未知的類別 %1$s 於來源檔 %3$s 第 %2$u 行"
 
 #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
author	Michael Vogt <michael.vogt@ubuntu.com>	2005-12-08 18:07:48 +0000
committer	Michael Vogt <michael.vogt@ubuntu.com>	2005-12-08 18:07:48 +0000
commit	fc25afd0b3fbe47a9ded2978142dadafe52a989b (patch)
tree	6604b7df797e34ad2347c00d7b727c3b943127d8
parent	193593331d2833dbc640f3bb1ad3dd6bfaac858f (diff)
parent	b7475c1ea32e60fca03b7092bfe7ee3fd3dfde47 (diff)