* merged with debian-sid branch

Patches applied:

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

 * bubulle@debian.org--2005/apt--main--0--patch-161
   Galician translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-162
   Spanish translation update 

 * bubulle@debian.org--2005/apt--main--0--patch-163
   Two strings corrected in the British translation

 * bubulle@debian.org--2005/apt--main--0--patch-164
   Danish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-165
   Completed Greek translation

 * bubulle@debian.org--2005/apt--main--0--patch-166
   Fix some permissions

 * bubulle@debian.org--2005/apt--main--0--patch-167
   Resync with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-168
   Vietnamese translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-169
   Update PO files and POT file...again

 * bubulle@debian.org--2005/apt--main--0--patch-170
   Compelted French translation

 * bubulle@debian.org--2005/apt--main--0--patch-171
   Activate Welsh translation

 * bubulle@debian.org--2005/apt--main--0--patch-172
   Completed to 512 strings

 * bubulle@debian.org--2005/apt--main--0--patch-173
   Russian translation completed

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

 * bubulle@debian.org--2005/apt--main--0--patch-175
   Merge from Philippe Batailler French manpages tree/Vietnamese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-176
   Galician translation update

 * bubulle@debian.org--2005/apt--main--0--patch-177
   Slovak translation update

 * bubulle@debian.org--2005/apt--main--0--patch-178
   Polish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-179
   Correct permissions

 * bubulle@debian.org--2005/apt--main--0--patch-180
   Japanese translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-182
   Catalan translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-183
   Brazilian Portuguese translation update

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

 * bubulle@debian.org--2005/apt--main--0--patch-185
   Japanese manpages translation update

 * bubulle@debian.org--2005/apt--main--0--patch-186
   Simplified Chinese translation update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
   * added debian-archive-keyring to recommends 

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122
   * fix apt-key to ask for the correct package

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
   * fix typo in apt-cache.8 manpage

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
   * fixed another typo in doc/apt-secure.8.xml

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
   * merged the debian-sid changes back

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
   * fixed the changelog yet again

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128
   * don't explod if a Provides has DepCompareOp

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129
   * fix regression about not working --print-uris in "install"

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131
   * create sources.list.d as well

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132
   * make apt-cache madion wotk without deb-src lines

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133
   * only clean out the list dir if the update was successful

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-134
   * only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-135
   tyop

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

 * mvo@debian.org--2005/apt--debian-sid--0--patch-18
   * merged with apt--mvo

 * mvo@debian.org--2005/apt--debian-sid--0--patch-19
   * synced with mainline

 * mvo@debian.org--2005/apt--debian-sid--0--patch-20
   * merged with mainline, finalized changelog

 * philippe.batailler@free.fr--2005/apt--main--0--patch-9
   manpages

1 files changed, 33 insertions, 29 deletions

diff --git a/po/pt.po b/po/pt.po
index 770803c52..98150e94d 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: 2006-01-04 18:51+0100\n"
+"POT-Creation-Date: 2006-01-20 14:01+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"
@@ -517,7 +517,7 @@ msgid " DeLink limit of %sB hit.\n"
 msgstr " Limite DeLink de %sB atingido.\n"
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:260
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Falha ao executar stat %s"
@@ -1092,7 +1092,7 @@ msgstr "Impossível encontrar um pacote de código fonte para %s"
 
 #: cmdline/apt-get.cc:1959
 #, fuzzy, c-format
-msgid "Skiping already downloaded file '%s'\n"
+msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 "Saltando a descompactação de pacote código fonte já descompactado em %s\n"
 
@@ -1686,12 +1686,12 @@ msgstr "Arquivo não encontrado"
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
 #: methods/gzip.cc:142
 msgid "Failed to stat"
 msgstr "Falha ao executar stat"
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
 msgid "Failed to set modification time"
 msgstr "Falha ao definir hora de modificação"
 
@@ -1819,7 +1819,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:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema fazendo o hash do ficheiro"
 
@@ -1951,76 +1951,76 @@ msgstr "Não foi possível abrir pipe para %s"
 msgid "Read error from %s process"
 msgstr "Erro de leitura do processo %s"
 
-#: methods/http.cc:381
+#: methods/http.cc:376
 msgid "Waiting for headers"
 msgstr "Aguardando por cabeçalhos"
 
-#: methods/http.cc:527
+#: methods/http.cc:522
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Recebi uma única linha de cabeçalho acima de %u caracteres"
 
-#: methods/http.cc:535
+#: methods/http.cc:530
 msgid "Bad header line"
 msgstr "Linha de cabeçalho errada"
 
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
 msgid "The HTTP server sent an invalid reply header"
 msgstr "O servidor http enviou um cabeçalho de resposta inválido"
 
-#: methods/http.cc:590
+#: methods/http.cc:585
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "O servidor http enviou um cabeçalho Conten-Length inválido"
 
-#: methods/http.cc:605
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "O servidor http enviou um cabeçalho Conten-Range inválido"
 
-#: methods/http.cc:607
+#: methods/http.cc:602
 msgid "This HTTP server has broken range support"
 msgstr "Este servidor http possui suporte a range errado"
 
-#: methods/http.cc:631
+#: methods/http.cc:626
 msgid "Unknown date format"
 msgstr "Formato de data desconhecido"
 
-#: methods/http.cc:778
+#: methods/http.cc:773
 msgid "Select failed"
 msgstr "Select falhou."
 
-#: methods/http.cc:783
+#: methods/http.cc:778
 msgid "Connection timed out"
 msgstr "A ligação expirou"
 
-#: methods/http.cc:806
+#: methods/http.cc:801
 msgid "Error writing to output file"
 msgstr "Erro gravando para ficheiro de saída"
 
-#: methods/http.cc:837
+#: methods/http.cc:832
 msgid "Error writing to file"
 msgstr "Erro gravando para ficheiro"
 
-#: methods/http.cc:865
+#: methods/http.cc:860
 msgid "Error writing to the file"
 msgstr "Erro gravando para o ficheiro"
 
-#: methods/http.cc:879
+#: methods/http.cc:874
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro lendo do servidor. O Remoto fechou a ligação"
 
-#: methods/http.cc:881
+#: methods/http.cc:876
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1112
+#: methods/http.cc:1107
 msgid "Bad header data"
 msgstr "Dados de cabeçalho errados"
 
-#: methods/http.cc:1129
+#: methods/http.cc:1124
 msgid "Connection failed"
 msgstr "Falhou a ligação"
 
-#: methods/http.cc:1220
+#: methods/http.cc:1215
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2574,11 +2574,15 @@ msgstr "Erro de I/O ao gravar a cache de código fonte"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falhou renomear, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum incorreto"
 
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:645
+msgid "There are no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:758
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2588,7 +2592,7 @@ msgstr ""
 "que você precisa consertar manualmente este pacote. (devido a arquitetura "
 "não especificada)."
 
-#: apt-pkg/acquire-item.cc:778
+#: apt-pkg/acquire-item.cc:817
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2597,7 +2601,7 @@ msgstr ""
 "Não foi possível localizar arquivo para o pacote %s. Isto pode significar "
 "que você precisa consertar manualmente este pacote."
 
-#: apt-pkg/acquire-item.cc:814
+#: apt-pkg/acquire-item.cc:853
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2605,7 +2609,7 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: "
 "para o pacote %s."
 
-#: apt-pkg/acquire-item.cc:901
+#: apt-pkg/acquire-item.cc:940
 msgid "Size mismatch"
 msgstr "Tamanho incorreto"