* merged with apt--mvo and corrected conflicts in po/

Patches applied:

 * apt@packages.debian.org/apt--sources-list-d--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-30

 * apt@packages.debian.org/apt--sources-list-d--0--patch-1
   Patch from apt-rpm via Michael Vogt to implement /etc/apt/sources.list.d

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

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

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-90
   * merged the sources.list.d patch

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-92
   * changelog update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-93
   * sources.list.d documented

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94
   * pkgDirStream has (slightly) better extract support now

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95
   * merge fix for #339533

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

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97
   * some more debug output

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98
   * ABI change: merged more flexible pkgAcquireFile code

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99
   * merged http download limit for apt (#146877)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100
   * applied parts of the string speedup patch from debian #319377 (ABI change)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101
   * fix for #340448

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102
   * finalized this release

diff --cc po/apt-all.pot
index aa72ef4,f474c6a..14cf0e0
--- 1/po/apt-all.pot
--- 2/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"

diff --cc po/bs.po
index 95b2811,b928190..34f46e1
--- 1/po/bs.po
--- 2/po/bs.po
+++ b/po/bs.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.26\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2004-05-06 15:25+0100\n"
  "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
  "Language-Team: Bosnian <lokal@lugbih.org>\n"

diff --cc po/ca.po
index ddb2cc7,bd1f479..924e84e
--- 1/po/ca.po
--- 2/po/ca.po
+++ b/po/ca.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-07-19 01:31+0200\n"
  "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
  "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"

diff --cc po/cs.po
index 1ee0f40,d7ccea8..c881977
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-11 16:14+0100\n"
  "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
  "Language-Team: Czech <provoz@debian.cz>\n"

diff --cc po/da.po
index 841f689,54fbdc8..82952f5
--- 1/po/da.po
--- 2/po/da.po
+++ b/po/da.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-da\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-11-07 15:28+0100\n"
  "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
  "Language-Team: Danish <dansk@klid.dk>\n"

diff --cc po/de.po
index 0b811ad,a28e3d9..7b9724d
--- 1/po/de.po
--- 2/po/de.po
+++ b/po/de.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.26\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-06-15 18:22+0200\n"
  "Last-Translator: Michael Piefel <piefel@debian.org>\n"
  "Language-Team:  <de@li.org>\n"

diff --cc po/el.po
index f24b628,91b6a09..88bbb77
--- 1/po/el.po
--- 2/po/el.po
+++ b/po/el.po
@@@ -16,7 -16,7 +16,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_po_el\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-07-14 14:25EEST\n"
  "Last-Translator: Greek Translation Team <debian-l10n-greek@lists.debian."
  "org>\n"

diff --cc po/en_GB.po
index 43b0daf,a8fee47..267f6fb
--- 1/po/en_GB.po
--- 2/po/en_GB.po
+++ b/po/en_GB.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2002-11-10 20:56+0100\n"
  "Last-Translator: Michael Piefel <piefel@debian.org>\n"
  "Language-Team: en_GB <en@li.org>\n"

diff --cc po/es.po
index dd862bd,fcc6980..97b5c54
--- 1/po/es.po
--- 2/po/es.po
+++ b/po/es.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.24\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-08 20:36+0100\n"
  "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
  "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"

diff --cc po/eu.po
index d27eb39,42fcecc..5ffad86
--- 1/po/eu.po
--- 2/po/eu.po
+++ b/po/eu.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_po_eu\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-11-07 22:37+0100\n"
  "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
  "Language-Team: librezale.org <librezale@librezale.org>\n"

diff --cc po/fi.po
index cddda29,2388bf6..c014ad3
--- 1/po/fi.po
--- 2/po/fi.po
+++ b/po/fi.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.26\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-15 14:09+0200\n"
  "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
  "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"

diff --cc po/fr.po
index 2df5dd2,f37e662..314cdaf
--- 1/po/fr.po
--- 2/po/fr.po
+++ b/po/fr.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: fr\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-11-01 18:16+0100\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

diff --cc po/he.po
index e6c4b75,07848e4..4418485
--- 1/po/he.po
--- 2/po/he.po
+++ b/po/he.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.25\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2004-06-10 19:58+0300\n"
  "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
  "Language-Team: Hebrew\n"

diff --cc po/hu.po
index 2ad80fa,731863e..0e35ad9
--- 1/po/hu.po
--- 2/po/hu.po
+++ b/po/hu.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: hu\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-15 18:03+0100\n"
  "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
  "Language-Team: Hungarian <gnome@gnome.hu>\n"

diff --cc po/it.po
index dd5cdd0,7aeeec8..e73ca33
--- 1/po/it.po
--- 2/po/it.po
+++ b/po/it.po
@@@ -5,7 -5,7 +5,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-10-05 17:38+0200\n"
  "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
  "Language-Team: Italian <it@li.org>\n"

diff --cc po/ja.po
index 23cb8b2,2feec2c..c03255c
--- 1/po/ja.po
--- 2/po/ja.po
+++ b/po/ja.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-09 12:54+0900\n"
  "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"

diff --cc po/ko.po
index dbc98f9,2382746..a49547b
--- 1/po/ko.po
--- 2/po/ko.po
+++ b/po/ko.po
@@@ -4,7 -4,7 +4,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-10 21:56+0900\n"
  "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
  "Language-Team: Korean <cwryu@debian.org>\n"

diff --cc po/nb.po
index 651ec6d,34cfc1d..2bc29a6
--- 1/po/nb.po
--- 2/po/nb.po
+++ b/po/nb.po
@@@ -19,7 -19,7 +19,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-09 10:45+0100\n"
  "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
  "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"

diff --cc po/nl.po
index 3dd09be,3dc814e..0e610fc
--- 1/po/nl.po
--- 2/po/nl.po
+++ b/po/nl.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-10 17:35+0100\n"
  "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
  "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"

diff --cc po/nn.po
index f33ee59,f57bba2..4159197
--- 1/po/nn.po
--- 2/po/nn.po
+++ b/po/nn.po
@@@ -9,7 -9,7 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_nn\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-14 23:30+0100\n"
  "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
  "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"

diff --cc po/pl.po
index 061bb11,54e94c6..5a03060
--- 1/po/pl.po
--- 2/po/pl.po
+++ b/po/pl.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-11 11:47+0100\n"
  "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
  "Language-Team: Polish <pddp@debian.linux.org.pl>\n"

diff --cc po/pt.po
index 361c18b,af44e7f..867630b
--- 1/po/pt.po
--- 2/po/pt.po
+++ b/po/pt.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+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"

diff --cc po/pt_BR.po
index 133bd7b,54946a2..d395955
--- 1/po/pt_BR.po
--- 2/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-06-16 10:24-0300\n"
  "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
  "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"

diff --cc po/ro.po
index fa00c27,9497f70..5af5cf0
--- 1/po/ro.po
--- 2/po/ro.po
+++ b/po/ro.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_po_ro\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-08-25 17:43+0300\n"
  "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
  "Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n"

diff --cc po/ru.po
index c1b37c7,a9921de..d5a2bb2
--- 1/po/ru.po
--- 2/po/ru.po
+++ b/po/ru.po
@@@ -12,7 -12,7 +12,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_po_ru\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-10-22 12:24+0400\n"
  "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
  "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"

diff --cc po/sk.po
index bed0bdc,451d237..f1fc04a
--- 1/po/sk.po
--- 2/po/sk.po
+++ b/po/sk.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-07-01 09:34+0200\n"
  "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
  "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

diff --cc po/sl.po
index 0ba4735,92fbaaa..67b9a92
--- 1/po/sl.po
--- 2/po/sl.po
+++ b/po/sl.po
@@@ -4,7 -4,7 +4,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-16 22:18+0100\n"
  "Last-Translator: Jure Èuhalev <gandalf@owca.info>\n"
  "Language-Team: Slovenian <sl@li.org>\n"

diff --cc po/sv.po
index 4f9c93a,b0d1e03..808d355
--- 1/po/sv.po
--- 2/po/sv.po
+++ b/po/sv.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-11-02 23:56+0100\n"
  "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
  "Language-Team: Swedish <sv@li.org>\n"

diff --cc po/tl.po
index 4f88618,18f664f..7ef7bde
--- 1/po/tl.po
--- 2/po/tl.po
+++ b/po/tl.po
@@@ -10,7 -10,7 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-11-03 03:35+0800\n"
  "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
  "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"

diff --cc po/zh_CN.po
index bab2ca5,6501190..bf33486
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,10 -7,10 +7,10 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.23\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
- "PO-Revision-Date: 2005-02-09 17:34+0800\n"
- "Last-Translator: Tchaikov <chaisave@263.net>\n"
- "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
+ "PO-Revision-Date: 2005-11-15 00:05+0800\n"
+ "Last-Translator: Tchaikov <tchaikov@sjtu.edu.cn>\n"
+ "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

diff --cc po/zh_TW.po
index 658eb3c,f405147..50fd550
--- 1/po/zh_TW.po
--- 2/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 0.5.4\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-10-20 11:08+0200\n"
 -"POT-Creation-Date: 2005-11-23 00:39+0100\n"
++"POT-Creation-Date: 2005-11-28 10:51+0100\n"
  "PO-Revision-Date: 2005-02-19 22:24+0800\n"
  "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
  "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"