From: Michael Vogt Date: Fri, 20 Apr 2007 16:20:23 +0000 (+0200) Subject: * merged from Christian Perrier: X-Git-Tag: 0.7.21~290^2 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/bc50fc3013aa4454d10376888e4ccc24d35de334?ds=inline;hp=-c * merged from Christian Perrier: * mr.po: New Marathi translation Closes: #416806 --- bc50fc3013aa4454d10376888e4ccc24d35de334 diff --combined debian/changelog index bcdeac310,a2daa2d3a..1fd4922b6 --- a/debian/changelog +++ b/debian/changelog @@@ -1,4 -1,4 +1,4 @@@ -apt (0.6.46.5) UNRELEASED; urgency=low +apt (0.6.47) UNRELEASED; urgency=low * apt-pkg/algorithm.cc: - use clog for all debugging @@@ -14,16 -14,7 +14,28 @@@ - only unmount if APT::CDROM::NoMount is false * methods/cdrom.cc: - only umount if it was mounted by the method before - + * po/gl.po: + - fix error translation that causes trouble to lsb_release + * apt-pkg/acquire-item.cc: + - if decompression of a index fails, delete the index + * [ABI] apt-pkg/acquire.{cc,h}: + - deal better with duplicated sources.list entries (avoid + double queuing of URLs) - this fixes hangs in bzip/gzip + * apt-pkg/policy.cc: + - allow multiple packages (thanks to David Foerster) - ++ * merged from Christian Perrier: ++ * mr.po: New Marathi translation Closes: #416806 ++ * zh_CN.po: Updated by Eric Pareja Closes: #416822 ++ * tl.po: Updated by Eric Pareja Closes: #416638 ++ * gl.po: Updated by Jacobo Tarrio ++ Closes: #412828 ++ * da.po: Updated by Claus Hindsgaul ++ Closes: #409483 ++ * fr.po: Remove a non-breakable space for usability ++ issues. Closes: #408877 ++ * ru.po: Updated Russian translation. Closes: #405476 ++ * *.po: Unfuzzy after upstream typo corrections ++ -- Michael Vogt Mon, 18 Dec 2006 19:39:05 +0100 apt (0.6.46.4) unstable; urgency=high diff --combined po/gl.po index c8aa6b0c0,40f269baa..bff17bd98 --- a/po/gl.po +++ b/po/gl.po @@@ -6,10 -6,10 +6,10 @@@ msgid " msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-10-11 20:34+0200\n" - "PO-Revision-Date: 2006-09-07 11:48+0200\n" + "POT-Creation-Date: 2006-12-19 11:37+0100\n" + "PO-Revision-Date: 2007-02-28 13:14+0100\n" "Last-Translator: Jacobo Tarrío \n" - "Language-Team: Galician \n" + "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@@ -108,7 -108,7 +108,7 @@@ msgstr " #: cmdline/apt-cache.cc:1470 #, c-format msgid "%4i %s\n" -msgstr "[%4i] %s\n" +msgstr "%4i %s\n" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 @@@ -1823,7 -1823,7 +1823,7 @@@ msgstr "A conexión do socket de datos msgid "Unable to accept connection" msgstr "Non se pode aceptar a conexión" - #: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 + #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@@ -1961,76 -1961,76 +1961,76 @@@ msgstr "Non se puido abrir unha canle p msgid "Read error from %s process" msgstr "Erro de lectura do proceso %s" - #: methods/http.cc:376 + #: methods/http.cc:377 msgid "Waiting for headers" msgstr "A agardar polas cabeceiras" - #: methods/http.cc:522 + #: methods/http.cc:523 #, c-format msgid "Got a single header line over %u chars" msgstr "Recibiuse unha soa liña de cabeceira en %u caracteres" - #: methods/http.cc:530 + #: methods/http.cc:531 msgid "Bad header line" msgstr "Liña de cabeceira incorrecta" - #: methods/http.cc:549 methods/http.cc:556 + #: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" msgstr "O servidor HTTP enviou unha cabeceira de resposta non válida" - #: methods/http.cc:585 + #: methods/http.cc:586 msgid "The HTTP server sent an invalid Content-Length header" msgstr "O servidor HTTP enviou unha cabeceira Content-Length non válida" - #: methods/http.cc:600 + #: methods/http.cc:601 msgid "The HTTP server sent an invalid Content-Range header" msgstr "O servidor HTTP enviou unha cabeceira Content-Range non válida" - #: methods/http.cc:602 + #: methods/http.cc:603 msgid "This HTTP server has broken range support" msgstr "Este servidor HTTP ten un soporte de rangos roto" - #: methods/http.cc:626 + #: methods/http.cc:627 msgid "Unknown date format" msgstr "Formato de data descoñecido" - #: methods/http.cc:773 + #: methods/http.cc:774 msgid "Select failed" msgstr "Fallou a chamada a select" - #: methods/http.cc:778 + #: methods/http.cc:779 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" - #: methods/http.cc:801 + #: methods/http.cc:802 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" - #: methods/http.cc:832 + #: methods/http.cc:833 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" - #: methods/http.cc:860 + #: methods/http.cc:861 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" - #: methods/http.cc:874 + #: methods/http.cc:875 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión" - #: methods/http.cc:876 + #: methods/http.cc:877 msgid "Error reading from server" msgstr "Erro ao ler do servidor" - #: methods/http.cc:1107 + #: methods/http.cc:1108 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" - #: methods/http.cc:1124 + #: methods/http.cc:1125 msgid "Connection failed" msgstr "A conexión fallou" - #: methods/http.cc:1215 + #: methods/http.cc:1216 msgid "Internal error" msgstr "Erro interno" @@@ -2103,12 -2103,12 +2103,12 @@@ msgstr "Erro de sintaxe %s:%u: Non se s msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" - #: apt-pkg/contrib/progress.cc:154 + #: apt-pkg/contrib/progress.cc:155 #, c-format msgid "%c%s... Error!" msgstr "%c%s... ¡Erro!" - #: apt-pkg/contrib/progress.cc:156 + #: apt-pkg/contrib/progress.cc:157 #, c-format msgid "%c%s... Done" msgstr "%c%s... Rematado" @@@ -2405,7 -2405,7 +2405,7 @@@ msgid " msgstr "" "O paquete %s ten que se reinstalar, pero non se pode atopar o seu arquivo." - #: apt-pkg/algorithms.cc:1059 + #: apt-pkg/algorithms.cc:1066 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@@ -2413,7 -2413,7 +2413,7 @@@ msgstr " "Erro, pkgProblemResolver::Resolve xerou interrupcións, pode estar causado " "por paquetes retidos." - #: apt-pkg/algorithms.cc:1061 + #: apt-pkg/algorithms.cc:1068 msgid "Unable to correct problems, you have held broken packages." msgstr "Non se poden resolver os problemas, ten retidos paquetes rotos." @@@ -2586,8 -2586,7 +2586,7 @@@ msgid "MD5Sum mismatch msgstr "Os MD5Sum non coinciden" #: apt-pkg/acquire-item.cc:640 - #, fuzzy - msgid "There are no public key available for the following key IDs:\n" + msgid "There is no public key available for the following key IDs:\n" msgstr "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" @@@ -2777,13 -2776,12 +2776,12 @@@ msgstr "Eliminouse %s completamente msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" + #~ msgid "Could not patch file" + #~ msgstr "Non se puido parchear o ficheiro" + #~ msgid "File date has changed %s" #~ msgstr "A data do ficheiro cambiou %s" - #, fuzzy - #~ msgid "Could not patch file" - #~ msgstr "Non se puido abrir o ficheiro %s" - #~ msgid "Reading file list" #~ msgstr "A ler a lista de paquetes"