From: Michael Vogt Date: Mon, 28 Nov 2005 09:54:54 +0000 (+0000) Subject: * merged with apt--mvo and corrected conflicts in po/ X-Git-Tag: 0.7.21~349 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b5d727a3d33a53d567b3e1fd79b32fc22faa407c * 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 --- b5d727a3d33a53d567b3e1fd79b32fc22faa407c diff --cc po/apt-all.pot index aa72ef458,f474c6a41..14cf0e053 --- a/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 \n" "Language-Team: LANGUAGE \n" diff --cc po/bs.po index 95b281114,b928190a8..34f46e186 --- a/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ć \n" "Language-Team: Bosnian \n" diff --cc po/ca.po index ddb2cc789,bd1f47988..924e84e77 --- a/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 \n" "Language-Team: Catalan \n" diff --cc po/cs.po index 1ee0f4089,d7ccea80c..c881977c4 --- a/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 \n" "Language-Team: Czech \n" diff --cc po/da.po index 841f68992,54fbdc88b..82952f574 --- a/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 \n" "Language-Team: Danish \n" diff --cc po/de.po index 0b811ad33,a28e3d9ca..7b9724d6d --- a/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 \n" "Language-Team: \n" diff --cc po/el.po index f24b6289d,91b6a09f5..88bbb7741 --- a/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 \n" diff --cc po/en_GB.po index 43b0daf09,a8fee4742..267f6fbd0 --- a/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 \n" "Language-Team: en_GB \n" diff --cc po/es.po index dd862bd48,fcc69804c..97b5c5428 --- a/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 \n" "Language-Team: Spanish \n" diff --cc po/eu.po index d27eb39ec,42fcecc3b..5ffad86b3 --- a/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 \n" "Language-Team: librezale.org \n" diff --cc po/fi.po index cddda29a0,2388bf637..c014ad359 --- a/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 \n" "Language-Team: Finnish \n" diff --cc po/fr.po index 2df5dd262,f37e66292..314cdaf6b --- a/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 \n" "Language-Team: French \n" diff --cc po/he.po index e6c4b75df,07848e46a..441848504 --- a/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 \n" "Language-Team: Hebrew\n" diff --cc po/hu.po index 2ad80face,731863ed4..0e35ad92b --- a/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 \n" "Language-Team: Hungarian \n" diff --cc po/it.po index dd5cdd06a,7aeeec87b..e73ca33e0 --- a/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 \n" "Language-Team: Italian \n" diff --cc po/ja.po index 23cb8b250,2feec2ce8..c03255c9a --- a/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 \n" "Language-Team: Debian Japanese List \n" diff --cc po/ko.po index dbc98f9c7,23827460b..a49547bdf --- a/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 \n" "Language-Team: Korean \n" diff --cc po/nb.po index 651ec6dee,34cfc1d6e..2bc29a623 --- a/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 \n" "Language-Team: Norwegian Bokmål \n" diff --cc po/nl.po index 3dd09be51,3dc814ea2..0e610fc5a --- a/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 \n" "Language-Team: debian-l10n-dutch \n" diff --cc po/nn.po index f33ee59a8,f57bba2af..415919752 --- a/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 \n" "Language-Team: Norwegian nynorsk \n" diff --cc po/pl.po index 061bb117c,54e94c641..5a030603e --- a/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 \n" "Language-Team: Polish \n" diff --cc po/pt.po index 361c18bee,af44e7f15..867630b44 --- a/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 \n" "Language-Team: Portuguese \n" diff --cc po/pt_BR.po index 133bd7bbc,54946a2c4..d395955b1 --- a/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 \n" "Language-Team: Debian-BR Project \n" diff --cc po/ro.po index fa00c27e8,9497f70b2..5af5cf013 --- a/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 \n" "Language-Team: Romanian \n" diff --cc po/ru.po index c1b37c7e3,a9921de46..d5a2bb2bd --- a/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 \n" "Language-Team: Russian \n" diff --cc po/sk.po index bed0bdc20,451d2379e..f1fc04a98 --- a/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 \n" "Language-Team: Slovak \n" diff --cc po/sl.po index 0ba47352d,92fbaaa4a..67b9a9291 --- a/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 \n" "Language-Team: Slovenian \n" diff --cc po/sv.po index 4f9c93acb,b0d1e03ac..808d355af --- a/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 \n" "Language-Team: Swedish \n" diff --cc po/tl.po index 4f88618d2,18f664faf..7ef7bde7c --- a/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 \n" "Language-Team: Tagalog \n" diff --cc po/zh_CN.po index bab2ca50c,6501190a1..bf33486fd --- a/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 \n" - "Language-Team: Chinese (simplified) \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 \n" + "Language-Team: Debian Chinese [GB] \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 658eb3c0d,f405147f8..50fd5508c --- a/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 \n" "Language-Team: Chinese/Traditional \n"