Merge from CVS

Patches applied:

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1304
   Basque correction.

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1305
   Updated Brazilian Portuguese and Greek (256396 and 2567...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1306
   New Korean translation from Changwoo Ryu <cwryu@debian....

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1307
   German translation now available in two flavours: with ...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1308
   Finalize 0.5.26

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1309
   Remove duplicate entry

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1310
   Note about archtable when architecture test fails

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1311
   0.5.26 (really)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1312
   German translation now available in two flavours: with ...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1313
   New Finnish translation from Tapio Lehtonen <tale@debia...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1314
   New Bosnian translation from Safir ��e��erovi�� <sapphi...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1315
   Fix Italian incontrario

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1316
   * Bring configure-index up to date with documented opti...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1317
   configure-index contains example values, not strictly d...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1318
   Updated Spanish from Ruben Porras (Closes:#260483)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1319
   Updated Danish from Claus Hindsgaul (Closes: #260569)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1320
   Updated Slovak from Peter Mann (Closes: #260627)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1321
   Updated Portuguese from Miguel Figueiredo (Closes: #261423)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1322
   * Add Polish translation of offline.sgml (Closes: #259229)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1323
   urgency=high

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1324
   Sync with new POT.

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1325
   Updated Hungarian from Kelemen G��bor <kelemeng@gnome.hu>.

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1326
   Updated Greek from George Papamichelakis (Closes: #265004)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1327
   Updated Simplified Chinese from Tchaikov (Closes: #265190)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1328
   Updated French by Christian Perrier (Closes: #265816)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1329
   Updated Japanese by Kenshi Muto (Closes: #265630)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1330
   Updated French by Christian Perrier (Closes: #265816)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1331
   - Updated Catalan from Jordi Mallach

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1332
   Updated Dutch from Bart Cornelis (Closes: #268258)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1333
   Updated Portuguese from Miguel Figueiredo (Closes: #268265)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1334
   Updated Dutch from Bart Cornelis (Closes: #268258)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1335
   APT::Get::APT::Get::No-List-Cleanup -> APT::Get::List-C...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1336
   Updated Polish from Robert Luberda <robert@debian.org> ...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1337
   Updated Danish from Claus Hindsgaul (Closes: #269417)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1338
   Updated Norwegian Nynorsk from H��vard Korsvoll <korsvo...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1339
   Updated Russian from Yuri Kozlov <yuray@id.ru> (Closes:...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1340
   Updated Italian from Samuele Giovanni Tonon (Closes: #2...

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1341
   Updated Dutch from Bart Cornelis (Closes: #278697)

 * apt@arch.ubuntu.com/apt--MAIN--0--patch-1342
   Updated Slovak from Peter Mann (Closes: #279481)

1 files changed, 23 insertions, 23 deletions

diff --git a/po/es.po b/po/es.po
index abf25e2ab..5346ae868 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-29 21:46-0700\n"
-"PO-Revision-Date: 2004-05-09 23:42+0200\n"
+"POT-Creation-Date: 2004-05-31 19:57-0700\n"
+"PO-Revision-Date: 2004-07-20 21:37+0200\n"
 "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -434,8 +434,8 @@ msgstr "DB anticuada, intentando actualizar %s"
 
 #: ftparchive/cachedb.cc:73
 #, c-format
-msgid "Unable to open DB file %s"
-msgstr "No se pudo abrir el archivo DB %s"
+msgid "Unable to open DB file %s: %s"
+msgstr "No se pudo abrir el archivo DB %s: %s"
 
 #: ftparchive/cachedb.cc:114
 #, c-format
@@ -1749,7 +1749,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:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
@@ -1843,76 +1843,76 @@ msgstr "No pude abrir una tubería para %s"
 msgid "Read error from %s process"
 msgstr "Error de lectura de %s procesos"
 
-#: methods/http.cc:340
+#: methods/http.cc:344
 msgid "Waiting for headers"
 msgstr "Esperando las cabeceras"
 
-#: methods/http.cc:486
+#: methods/http.cc:490
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Obtuve una sola línea de cabecera arriba de %u caracteres"
 
-#: methods/http.cc:494
+#: methods/http.cc:498
 msgid "Bad header line"
 msgstr "Mala línea de cabecera"
 
-#: methods/http.cc:513 methods/http.cc:520
+#: methods/http.cc:517 methods/http.cc:524
 msgid "The http server sent an invalid reply header"
 msgstr "El servidor de http envió una cabecera de respuesta inválida"
 
-#: methods/http.cc:549
+#: methods/http.cc:553
 msgid "The http server sent an invalid Content-Length header"
 msgstr "El servidor de http envió una cabecera de Content-Length inválida"
 
-#: methods/http.cc:564
+#: methods/http.cc:568
 msgid "The http server sent an invalid Content-Range header"
 msgstr "El servidor de http envió una cabecera de Content-Range inválida"
 
-#: methods/http.cc:566
+#: methods/http.cc:570
 msgid "This http server has broken range support"
 msgstr "Éste servidor de http tiene el soporte de alcance roto"
 
-#: methods/http.cc:590
+#: methods/http.cc:594
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/http.cc:733
+#: methods/http.cc:737
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:738
+#: methods/http.cc:742
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
-#: methods/http.cc:761
+#: methods/http.cc:765
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:789
+#: methods/http.cc:793
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:814
+#: methods/http.cc:818
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:828
+#: methods/http.cc:832
 msgid "Error reading from server Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
-#: methods/http.cc:830
+#: methods/http.cc:834
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:1061
+#: methods/http.cc:1065
 msgid "Bad header Data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1078
+#: methods/http.cc:1082
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
-#: methods/http.cc:1169
+#: methods/http.cc:1173
 msgid "Internal error"
 msgstr "Error interno"