* merged from bubulle

diff --cc po/es.po
index d301f3986966b626115a8af8942dac049e743627,194e640c2482748befa764c53a39f54b7dd82122..a9952f38c7d432be01b6147aabe0829005424d82
--- 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 2b0c17f53b0ce880f0be8d26477d005cfde662f2,70fde921e599d78430aeecbcbb8eb5203d921abd..16f7c0b2cccbb68d723eb423a691e6598390a39e
--- 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 06db66da9422238b789808cb92fc2adea167d228,d798ad2b4262fd28a3f1f7850b3580e628216fe8..21fcba4e4532fb0f0bd13c2d6d16cf94f6cff9a6
--- 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 0570597648453999b8797f808e854b20f826f055,c01808d5db79acca29f20bd15f0dbeef4b33797f..902bb78428fdcb6bd4e1348bb7e066a13b7ea9ab
--- 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"