* merged from bubulle

diff --cc po/es.po
index d301f39,194e640..a9952f3
--- 1/po/es.po
--- 2/po/es.po
+++ b/po/es.po
@@@ -10,9 -10,9 +10,9 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6.42.3exp1\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-11 20:19+0200\n"
 +"POT-Creation-Date: 2006-10-11 20:34+0200\n"
  "PO-Revision-Date: 2006-10-08 00:23+0200\n"
- "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
+ "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
  "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"

diff --cc po/nb.po
index 2b0c17f,70fde92..16f7c0b
--- 1/po/nb.po
--- 2/po/nb.po
+++ b/po/nb.po
@@@ -19,10 -15,10 +15,10 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-11 20:19+0200\n"
 +"POT-Creation-Date: 2006-10-11 20:34+0200\n"
  "PO-Revision-Date: 2006-10-16 00:35+0100\n"
  "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
- "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
+ "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"

diff --cc po/nn.po
index 06db66d,d798ad2..21fcba4
--- 1/po/nn.po
--- 2/po/nn.po
+++ b/po/nn.po
@@@ -9,9 -9,9 +9,9 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_nn\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-11 20:19+0200\n"
 +"POT-Creation-Date: 2006-10-11 20:34+0200\n"
  "PO-Revision-Date: 2005-02-14 23:30+0100\n"
- "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
+ "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
  "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-1\n"

diff --cc po/pt_BR.po
Simple merge

diff --cc po/sl.po
index 0570597,c01808d..902bb78
--- 1/po/sl.po
--- 2/po/sl.po
+++ b/po/sl.po
@@@ -4,9 -4,9 +4,9 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-10-11 20:19+0200\n"
 +"POT-Creation-Date: 2006-10-11 20:34+0200\n"
  "PO-Revision-Date: 2005-02-16 22:18+0100\n"
- "Last-Translator: Jure Èuhalev <gandalf@owca.info>\n"
+ "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
  "Language-Team: Slovenian <sl@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=ISO-8859-2\n"