Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog

1 files changed, 193 insertions, 183 deletions

diff --git a/po/gl.po b/po/gl.po
index c51f5a027..fc10b5552 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-25 22:21+0100\n"
+"POT-Creation-Date: 2014-02-06 20:46+0100\n"
 "PO-Revision-Date: 2011-05-12 15:28+0100\n"
 "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -116,7 +116,7 @@ msgstr "Debe fornecer cando menos un patrón de busca"
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Non foi posíbel atopar o paquete %s"
@@ -162,7 +162,7 @@ msgid "  Version table:"
 msgstr "  Táboa de versións:"
 
 #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
 #, c-format
@@ -355,16 +355,16 @@ msgstr "Produciuse un erro interno, o solucionador interno estragou cousas"
 msgid "Unable to lock the download directory"
 msgstr "Non é posíbel bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:725
 msgid "Must specify at least one package to fetch source for"
 msgstr "Ten que especificar polo menos un paquete para obter o código fonte"
 
-#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non sé posíbel atopar un paquete fonte para %s"
 
-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:782
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -373,7 +373,7 @@ msgstr ""
 "AVISO: o paquete «%s» mantense no sistema de control de versións «%s» en:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:787
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -385,97 +385,97 @@ msgstr ""
 "para obter as últimas actualizacións (posibelmente non publicadas) do "
 "paquete.\n"
 
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:840
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado «%s»\n"
 
-#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866
 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non foi posíbel determinar o espazo libre en %s"
 
-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:877
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre abondo en %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:886
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Ten que recibir %sB/%sB de arquivos de fonte.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:888
+#: cmdline/apt-get.cc:891
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Ten que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:897
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:918
 msgid "Failed to fetch some archives."
 msgstr "Non se puideron obter algúns arquivos."
 
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:949
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetado do código fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:961
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetado «%s».\n"
 
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:962
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete «dpkg-dev» estea instalado.\n"
 
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:984
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a orde de construción de «%s».\n"
 
-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1004
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1023
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar polo menos un paquete para comprobarlle as dependencias "
 "de compilación"
 
-#: cmdline/apt-get.cc:1045
+#: cmdline/apt-get.cc:1048
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non é posíbel obter a información de dependencias de compilación de %s"
 
-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:1262
+#: cmdline/apt-get.cc:1265
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -484,7 +484,7 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1280
+#: cmdline/apt-get.cc:1283
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -493,14 +493,14 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1303
+#: cmdline/apt-get.cc:1306
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non foi posíbel satisfacer a dependencia «%s» de %s: O paquete instalado %s "
 "é novo de máis"
 
-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1345
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -509,7 +509,7 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque ningunha versión "
 "dispoñíbel do paquete %s satisfai os requirimentos de versión"
 
-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1351
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -518,30 +518,30 @@ msgstr ""
 "A dependencia «%s» de %s non se pode satisfacer porque non se pode atopar o "
 "paquete %s"
 
-#: cmdline/apt-get.cc:1371
+#: cmdline/apt-get.cc:1374
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non foi posíbel satisfacer a dependencia «%s» de %s: %s"
 
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1389
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de construción de %s."
 
-#: cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1394
 msgid "Failed to process build dependencies"
 msgstr "Non se puideron procesar as dependencias de construción"
 
-#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
 #, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Rexistro de cambios de %s (%s)"
 
-#: cmdline/apt-get.cc:1582
+#: cmdline/apt-get.cc:1585
 msgid "Supported modules:"
 msgstr "Módulos admitidos:"
 
-#: cmdline/apt-get.cc:1623
+#: cmdline/apt-get.cc:1626
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -661,7 +661,7 @@ msgstr "%s xa é a versión máis recente.\n"
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1183
+#: apt-pkg/deb/dpkgpm.cc:1182
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Agardouse por %s pero non estaba alí"
@@ -754,16 +754,16 @@ msgstr "Non é posíbel desmontar o CD-ROM de %s, pode estarse empregando aínda
 msgid "Disk not found."
 msgstr "Non se atopou o disco"
 
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
 msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:618 methods/rred.cc:627
+#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
+#: methods/rred.cc:598 methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Non foi posíbel determinar o estado"
 
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624
+#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Non foi posíbel estabelecer a hora de modificación"
 
@@ -772,34 +772,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI incorrecto, os URI locais non deben comezar por //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:173
+#: methods/ftp.cc:172
 msgid "Logging in"
 msgstr "Identificándose"
 
-#: methods/ftp.cc:179
+#: methods/ftp.cc:178
 msgid "Unable to determine the peer name"
 msgstr "Non é posíbel determinar o nome do outro extremo"
 
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
 msgid "Unable to determine the local name"
 msgstr "Non é posíbel determinar o nome local"
 
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:214 methods/ftp.cc:242
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "O servidor rexeitou a conexión e dixo: %s"
 
-#: methods/ftp.cc:221
+#: methods/ftp.cc:220
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Fallou a orde USER, o servidor dixo: %s"
 
-#: methods/ftp.cc:228
+#: methods/ftp.cc:227
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Fallou a orde PASS, o servidor dixo: %s"
 
-#: methods/ftp.cc:248
+#: methods/ftp.cc:247
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -807,122 +807,122 @@ msgstr ""
 "Especificouse un servidor proxy pero non un script de conexión, Acquire::"
 "ftp::ProxyLogin está baleiro."
 
-#: methods/ftp.cc:276
+#: methods/ftp.cc:275
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Fallou a orde do script de acceso «%s», o servidor dixo: %s"
 
-#: methods/ftp.cc:302
+#: methods/ftp.cc:301
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Fallou a orde TYPE, o servidor dixo: %s"
 
-#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236
 msgid "Connection timeout"
 msgstr "Esgotouse o tempo para a conexión"
 
-#: methods/ftp.cc:346
+#: methods/ftp.cc:345
 msgid "Server closed the connection"
 msgstr "O servidor pechou a conexión"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
+#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292
 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
 msgid "Read error"
 msgstr "Produciuse un erro de lectura"
 
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:355 methods/rsh.cc:205
 msgid "A response overflowed the buffer."
 msgstr "Unha resposta desbordou o búfer."
 
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:372 methods/ftp.cc:384
 msgid "Protocol corruption"
 msgstr "Dano no protocolo"
 
-#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
+#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
 #: apt-pkg/contrib/fileutl.cc:1425
 msgid "Write error"
 msgstr "Produciuse un erro de escritura"
 
-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
 msgid "Could not create a socket"
 msgstr "Non é posíbel crear un socket"
 
-#: methods/ftp.cc:708
+#: methods/ftp.cc:707
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 "Non é posíbel conectar o socket de datos, o tempo esgotouse para a conexión"
 
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
 msgid "Failed"
 msgstr "Fallou"
 
-#: methods/ftp.cc:714
+#: methods/ftp.cc:713
 msgid "Could not connect passive socket."
 msgstr "Non é posíbel conectar o socket pasivo."
 
-#: methods/ftp.cc:731
+#: methods/ftp.cc:730
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo non puido obter un socket no que atender"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:744
 msgid "Could not bind a socket"
 msgstr "Non é posíbel ligar un socket"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:748
 msgid "Could not listen on the socket"
 msgstr "Non é posíbel escoitar no socket"
 
-#: methods/ftp.cc:756
+#: methods/ftp.cc:755
 msgid "Could not determine the socket's name"
 msgstr "Non é posíbel determinar o nome do socket"
 
-#: methods/ftp.cc:788
+#: methods/ftp.cc:787
 msgid "Unable to send PORT command"
 msgstr "Non é posíbel enviar a orde PORT"
 
-#: methods/ftp.cc:798
+#: methods/ftp.cc:797
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Familia de enderezos %u (AF_*) descoñecida"
 
-#: methods/ftp.cc:807
+#: methods/ftp.cc:806
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Produciuse un fallou na orde EPRT, o servidor dixo: %s"
 
-#: methods/ftp.cc:827
+#: methods/ftp.cc:826
 msgid "Data socket connect timed out"
 msgstr "A conexión do socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:834
+#: methods/ftp.cc:833
 msgid "Unable to accept connection"
 msgstr "Non é posíbel aceptar a conexión"
 
-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312
 msgid "Problem hashing file"
 msgstr "Xurdiu un problema ao calcular o hash do ficheiro"
 
-#: methods/ftp.cc:886
+#: methods/ftp.cc:885
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Non é posíbel obter o ficheiro, o servidor dixo «%s»"
 
-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:900 methods/rsh.cc:331
 msgid "Data socket timed out"
 msgstr "O socket de datos esgotou o tempo"
 
-#: methods/ftp.cc:931
+#: methods/ftp.cc:930
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Produciuse un fallou na transferencia de datos, o servidor dixo «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1009
 msgid "Query"
 msgstr "Petición"
 
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1123
 msgid "Unable to invoke "
 msgstr "Non é posíbel chamar a "
 
@@ -988,40 +988,40 @@ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Non é posíbel conectar %s:%s:"
 
-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:166
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 "Erro interno: Sinatura correcta, pero non foi posíbel determinar a pegada "
 "dixital da chave"
 
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:170
 msgid "At least one invalid signature was encountered."
 msgstr "Atopouse polo menos unha sinatura incorrecta."
 
-#: methods/gpgv.cc:173
+#: methods/gpgv.cc:172
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 "Non é posíbel executar «gpgv» para verificar a sinatura (Está instalado "
 "gpgv?)"
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:178
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:182
 msgid "Unknown error executing gpgv"
 msgstr "Produciuse un erro descoñecido ao executar gpgv"
 
-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
 msgid "The following signatures were invalid:\n"
 msgstr "As seguintes sinaturas non eran correctas:\n"
 
-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:229
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -1029,36 +1029,36 @@ msgstr ""
 "Non se puideron verificar as seguintes sinaturas porque a chave pública non "
 "está dispoñíbel:\n"
 
-#: methods/gzip.cc:65
+#: methods/gzip.cc:64
 msgid "Empty files can't be valid archives"
 msgstr "Os ficheiros baleiros non poden ser arquivadores válidos"
 
-#: methods/http.cc:519
+#: methods/http.cc:516
 msgid "Error writing to the file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: methods/http.cc:533
+#: methods/http.cc:530
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Produciuse un erro ao ler do servidor. O extremo remoto pechou a conexión"
 
-#: methods/http.cc:535
+#: methods/http.cc:532
 msgid "Error reading from server"
 msgstr "Produciuse un erro ao ler do servidor"
 
-#: methods/http.cc:571
+#: methods/http.cc:568
 msgid "Error writing to file"
 msgstr "Produciuse un erro ao escribir nun ficheiro"
 
-#: methods/http.cc:631
+#: methods/http.cc:628
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:636
+#: methods/http.cc:633
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:659
+#: methods/http.cc:656
 msgid "Error writing to output file"
 msgstr "Produciuse un erro ao escribir no ficheiro de saída"
 
@@ -1095,11 +1095,11 @@ msgstr "Formato de datos descoñecido"
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:507 methods/server.cc:563
 msgid "Connection failed"
 msgstr "Produciuse un fallo na conexión"
 
-#: methods/server.cc:656
+#: methods/server.cc:655
 msgid "Internal error"
 msgstr "Produciuse un erro interno"
 
@@ -1358,101 +1358,108 @@ msgstr "Instalar estes paquetes sen verificación?"
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non foi posíbel obter %s  %s\n"
 
-#: apt-private/private-output.cc:200
-msgid "installed,upgradable to: "
+#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-show.cc:86
+msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:206
+#: apt-private/private-output.cc:198
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Instalado]"
+
+#: apt-private/private-output.cc:202
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:205
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:207
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:209
 #, fuzzy
 msgid "[installed]"
 msgstr " [Instalado]"
 
-#: apt-private/private-output.cc:219
-msgid "[upgradable from: "
+#: apt-private/private-output.cc:213
+#, c-format
+msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:225
+#: apt-private/private-output.cc:217
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:316
+#: apt-private/private-output.cc:317
 msgid "The following packages have unmet dependencies:"
 msgstr "Os seguintes paquetes teñen dependencias sen cumprir:"
 
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:407
 #, c-format
 msgid "but %s is installed"
 msgstr "mais %s está instalado"
 
-#: apt-private/private-output.cc:408
+#: apt-private/private-output.cc:409
 #, c-format
 msgid "but %s is to be installed"
 msgstr "mais vaise instalar %s"
 
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:416
 msgid "but it is not installable"
 msgstr "mais non é instalábel"
 
-#: apt-private/private-output.cc:417
+#: apt-private/private-output.cc:418
 msgid "but it is a virtual package"
 msgstr "mais é un paquete virtual"
 
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:421
 msgid "but it is not installed"
 msgstr "mais non está instalado"
 
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:421
 msgid "but it is not going to be installed"
 msgstr "mais non se vai a instalar"
 
-#: apt-private/private-output.cc:425
+#: apt-private/private-output.cc:426
 msgid " or"
 msgstr " ou"
 
-#: apt-private/private-output.cc:454
+#: apt-private/private-output.cc:455
 msgid "The following NEW packages will be installed:"
 msgstr "Os seguintes paquetes NOVOS hanse instalar:"
 
-#: apt-private/private-output.cc:480
+#: apt-private/private-output.cc:481
 msgid "The following packages will be REMOVED:"
 msgstr "Vanse RETIRAR os paquetes seguintes:"
 
-#: apt-private/private-output.cc:502
+#: apt-private/private-output.cc:503
 msgid "The following packages have been kept back:"
 msgstr "Consérvanse os seguintes paquetes:"
 
-#: apt-private/private-output.cc:523
+#: apt-private/private-output.cc:524
 msgid "The following packages will be upgraded:"
 msgstr "Vanse anovar os paquetes seguintes:"
 
-#: apt-private/private-output.cc:544
+#: apt-private/private-output.cc:545
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Vanse REVERTER os seguintes paquetes :"
 
-#: apt-private/private-output.cc:564
+#: apt-private/private-output.cc:565
 msgid "The following held packages will be changed:"
 msgstr "Vanse modificar os paquetes retidos seguintes:"
 
-#: apt-private/private-output.cc:619
+#: apt-private/private-output.cc:620
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (por mor de %s) "
 
-#: apt-private/private-output.cc:627
+#: apt-private/private-output.cc:628
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1460,27 +1467,27 @@ msgstr ""
 "AVISO: Retiraranse os seguintes paquetes esenciais.\n"
 "Isto NON se debe facer a menos que saiba exactamente o que está a facer!"
 
-#: apt-private/private-output.cc:658
+#: apt-private/private-output.cc:659
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu anovados, %lu instalados, "
 
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:663
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:665
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: apt-private/private-output.cc:666
+#: apt-private/private-output.cc:667
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "Vanse retirar %lu e deixar %lu sen anovar.\n"
 
-#: apt-private/private-output.cc:670
+#: apt-private/private-output.cc:671
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu non instalados ou retirados de todo.\n"
@@ -1489,7 +1496,7 @@ msgstr "%lu non instalados ou retirados de todo.\n"
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:692
+#: apt-private/private-output.cc:693
 msgid "[Y/n]"
 msgstr "[S/n]"
 
@@ -1497,21 +1504,21 @@ msgstr "[S/n]"
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:698
+#: apt-private/private-output.cc:699
 msgid "[y/N]"
 msgstr "[s/N]"
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:709
+#: apt-private/private-output.cc:710
 msgid "Y"
 msgstr "S"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:715
+#: apt-private/private-output.cc:716
 msgid "N"
 msgstr "N"
 
-#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Produciuse un erro na compilación da expresión regular - %s"
@@ -1569,10 +1576,6 @@ msgstr "Feito"
 msgid "Full Text Search"
 msgstr ""
 
-#: apt-private/private-show.cc:81 apt-private/private-show.cc:86
-msgid "unknown"
-msgstr ""
-
 #: apt-private/private-show.cc:152
 #, c-format
 msgid "There is %lu additional record. Please use the '-a' switch to see it"
@@ -1688,11 +1691,11 @@ msgstr "Non é posíbel ler o ficheiro de replica «%s»"
 msgid "[Mirror: %s]"
 msgstr "[Replica: %s]"
 
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Non foi posíbel crear a canle IPC ao subproceso"
 
-#: methods/rsh.cc:340
+#: methods/rsh.cc:339
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
@@ -2014,31 +2017,38 @@ msgstr "  %s tampouco ten unha entrada de «override» de binarios\n"
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Non foi posíbel reservar memoria"
 
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:35 ftparchive/override.cc:139
 #, c-format
 msgid "Unable to open %s"
 msgstr "Non é posíbel puido abrir %s"
 
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:65
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "«Override» %s liña %lu incorrecta (1)"
+
+#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Non foi posíbel ler o ficheiro de «override» %s"
+
+#: ftparchive/override.cc:163
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
 msgstr "«Override» %s liña %lu incorrecta (1)"
 
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:175
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
 msgstr "«Override» %s liña %lu incorrecta (2)"
 
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:188
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
 msgstr "«Override» %s liña %lu incorrecta (3)"
 
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Non foi posíbel ler o ficheiro de «override» %s"
-
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
@@ -2066,20 +2076,20 @@ msgstr "Fillo de compresión"
 msgid "Internal error, failed to create %s"
 msgstr "Produciuse un erro interno, non foi posíbel crear %s"
 
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:302
 msgid "IO to subprocess/file failed"
 msgstr "Produciuse un fallo na E/S do subproceso/ficheiro"
 
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:340
 msgid "Failed to read while computing MD5"
 msgstr "Non foi posíbel ler ao calcular o MD5"
 
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:356
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Xurdiu un problema ao desligar %s"
 
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Non foi posíbel cambiar o nome de %s a %s"
@@ -2216,12 +2226,12 @@ msgstr "Desvío %s -> %s engadido dúas veces"
 msgid "Duplicate conf file %s/%s"
 msgstr "Ficheiro de configuración %s/%s duplicado"
 
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Non foi posíbel escribir no ficheiro «%s»"
 
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:105
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Non foi posíbel pechar o ficheiro %s"
@@ -2333,7 +2343,7 @@ msgstr ""
 "Dynamic MMap executouse fora do lugar. Incremente o tamaño de APT::Cache-"
 "Start. O valor actual é : %lu. (man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:446
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
@@ -2342,7 +2352,7 @@ msgstr ""
 "Non é posíbel aumentar o tamaño de MMap xa que o límite de %lu bytes xa foi "
 "acadado."
 
-#: apt-pkg/contrib/mmap.cc:443
+#: apt-pkg/contrib/mmap.cc:449
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2748,7 +2758,7 @@ msgstr "Non foi posíbel gravar o ficheiro de estado temporal %s"
 msgid "Unable to parse package file %s (1)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (1)"
 
-#: apt-pkg/tagfile.cc:231
+#: apt-pkg/tagfile.cc:235
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Non é posíbel analizar o ficheiro de paquetes %s (2)"
@@ -3284,34 +3294,34 @@ msgstr "Non é posíbel atopar un rexistro de autenticación para: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Valor de hash non coincidente para: %s"
 
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:469
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Non se atopou a publicación «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:470
+#: apt-pkg/cacheset.cc:472
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Non se atopou a versión «%s» de «%s»"
 
-#: apt-pkg/cacheset.cc:581
+#: apt-pkg/cacheset.cc:583
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Non foi posíbel atopar a tarefa «%s»"
 
-#: apt-pkg/cacheset.cc:587
+#: apt-pkg/cacheset.cc:589
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Non foi posíbel atopar ningún paquete pola expresión de rexistro «%s»"
 
-#: apt-pkg/cacheset.cc:598
+#: apt-pkg/cacheset.cc:600
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 "Non é posíbel seleccionar distintas versións do paquete «%s» xa que é "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3320,21 +3330,21 @@ msgstr ""
 "Non é posíbel seleccionar nin a versión instalada nin a candidata do paquete "
 "«%s» xa que non ten ningunha delas"
 
-#: apt-pkg/cacheset.cc:619
+#: apt-pkg/cacheset.cc:621
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Non é posíbel seleccionar a versión máis recente do paquete «%s» xa que é "
 "puramente virtual"
 
-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Non é posíbel seleccionar a versión candidata do paquete %s xa que non ten "
 "candidata"
 
-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/cacheset.cc:637
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
@@ -3384,12 +3394,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "Instalando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
 #, c-format
 msgid "Removing %s"
 msgstr "Retirando %s"
@@ -3410,89 +3420,89 @@ msgid "Running post-installation trigger %s"
 msgstr "Executando o disparador de post-instalación %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:809
+#: apt-pkg/deb/dpkgpm.cc:808
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Falta o directorio «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Non foi posíbel abrir o ficheiro «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:970
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:971
 #, c-format
 msgid "Unpacking %s"
 msgstr "Desempaquetando %s"
 
-#: apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:976
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparandose para configurar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:979
+#: apt-pkg/deb/dpkgpm.cc:978
 #, c-format
 msgid "Installed %s"
 msgstr "Instalouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:983
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparándose para o retirado de %s"
 
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:985
 #, c-format
 msgid "Removed %s"
 msgstr "Retirouse %s"
 
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparándose para retirar %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-pkg/deb/dpkgpm.cc:991
 #, c-format
 msgid "Completely removed %s"
 msgstr "Retirouse %s completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:1047
+#: apt-pkg/deb/dpkgpm.cc:1046
 msgid "ioctl(TIOCGWINSZ) failed"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071
+#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Non é posíbel escribir en %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1050
+#: apt-pkg/deb/dpkgpm.cc:1049
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1071
+#: apt-pkg/deb/dpkgpm.cc:1070
 msgid "Is stdout a terminal?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1559
+#: apt-pkg/deb/dpkgpm.cc:1558
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1621
+#: apt-pkg/deb/dpkgpm.cc:1620
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 "Non se escribiu ningún informe de Apport porque xa se acadou o nivel "
 "MaxReports"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1626
+#: apt-pkg/deb/dpkgpm.cc:1625
 msgid "dependency problems - leaving unconfigured"
 msgstr "problemas de dependencias - déixase sen configurar"
 
-#: apt-pkg/deb/dpkgpm.cc:1628
+#: apt-pkg/deb/dpkgpm.cc:1627
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3500,7 +3510,7 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica que "
 "é un error provinte dun fallo anterior."
 
-#: apt-pkg/deb/dpkgpm.cc:1634
+#: apt-pkg/deb/dpkgpm.cc:1633
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3508,7 +3518,7 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de disco cheo."
 
-#: apt-pkg/deb/dpkgpm.cc:1641
+#: apt-pkg/deb/dpkgpm.cc:1640
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3516,7 +3526,7 @@ msgstr ""
 "Non se escribiu un informe de contribución porque a mensaxe de erro indica "
 "un erro de falta de memoria"
 
-#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654
+#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653
 #, fuzzy
 msgid ""
 "No apport report written because the error message indicates an issue on the "
@@ -3525,7 +3535,7 @@ msgstr ""
 "Non se escribiu ningún informe de Apport porque a mensaxe de erro indica un "
 "erro de disco cheo."
 
-#: apt-pkg/deb/dpkgpm.cc:1675
+#: apt-pkg/deb/dpkgpm.cc:1674
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""