diff options
author | jbj <devnull@localhost> | 2004-12-05 19:10:53 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2004-12-05 19:10:53 +0000 |
commit | edc0ad3152685cdf284953c2618bc895e9025d01 (patch) | |
tree | 3c15f26bfb275e723cdf84d2c9335551288d41c4 | |
parent | d49ad2ca27a44c85ca1bf5f084b0d75274cb368b (diff) | |
download | rpm-edc0ad3152685cdf284953c2618bc895e9025d01.tar.gz |
- rpm-4.4 final release.rpm-4.4-release
CVS patchset: 7627
CVS date: 2004/12/05 19:10:53
-rw-r--r-- | lib/rpmchecksig.c | 2 | ||||
-rw-r--r-- | po/cs.po | 4 | ||||
-rw-r--r-- | po/da.po | 4 | ||||
-rw-r--r-- | po/de.po | 4 | ||||
-rw-r--r-- | po/fi.po | 4 | ||||
-rw-r--r-- | po/fr.po | 6 | ||||
-rw-r--r-- | po/gl.po | 4 | ||||
-rw-r--r-- | po/is.po | 4 | ||||
-rw-r--r-- | po/ja.po | 4 | ||||
-rw-r--r-- | po/ko.po | 4 | ||||
-rw-r--r-- | po/no.po | 4 | ||||
-rw-r--r-- | po/pl.po | 6 | ||||
-rw-r--r-- | po/pt.po | 4 | ||||
-rw-r--r-- | po/pt_BR.po | 4 | ||||
-rw-r--r-- | po/ro.po | 4 | ||||
-rw-r--r-- | po/rpm.pot | 4 | ||||
-rw-r--r-- | po/ru.po | 6 | ||||
-rw-r--r-- | po/sk.po | 4 | ||||
-rw-r--r-- | po/sl.po | 6 | ||||
-rw-r--r-- | po/sr.po | 4 | ||||
-rw-r--r-- | po/sv.po | 6 | ||||
-rw-r--r-- | po/tr.po | 4 | ||||
-rw-r--r-- | rpm.spec.in | 5 |
23 files changed, 52 insertions, 49 deletions
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 416ea49a2..bbb459669 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -593,7 +593,7 @@ static int rpmcliImportPubkeys(const rpmts ts, /* Read pgp packet. */ if ((rc = pgpReadPkts(fn, &pkt, &pktlen)) <= 0) { - rpmError(RPMERR_IMPORT, _("%s: import read failed.\n"), fn); + rpmError(RPMERR_IMPORT, _("%s: import read failed(%d).\n"), fn, rc); res++; continue; } @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -2610,7 +2610,7 @@ msgstr "%s: Fwrite selhalo: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead selhalo\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -2623,7 +2623,7 @@ msgstr "%s: rpmWriteSignature mislykkedes: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead mislykkedes\n" #: lib/rpmchecksig.c:608 @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n" "Language-Team: German <de@li.org>\n" @@ -2784,7 +2784,7 @@ msgstr "%s: »rpmReadSignature« fehlgeschlagen\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: »readLead« fehlgeschlagen\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" @@ -2660,7 +2660,7 @@ msgstr "%s: rpmReadSignature epäonnistui\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead epäonnistui\n" #: lib/rpmchecksig.c:608 @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: RPM 4.2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2003-07-06 01:36+0200\n" "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n" "Language-Team: RPM French Translation <rpm-fr@livna.org>\n" @@ -2625,8 +2625,8 @@ msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: échec de rpmWriteSignature: %s\n" #: lib/rpmchecksig.c:596 -#, c-format -msgid "%s: import read failed.\n" +#, fuzzy, c-format +msgid "%s: import read failed(%d).\n" msgstr "%s: échec de la lecture d'import.\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -2517,7 +2517,7 @@ msgstr "" #: lib/rpmchecksig.c:596 #, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -2548,7 +2548,7 @@ msgstr "" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: Fseek brást: %s\n" #: lib/rpmchecksig.c:608 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n" "Language-Team: JRPM <jrpm@linux.or.jp>\n" @@ -2693,7 +2693,7 @@ msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n" "Language-Team: GNU Translation project <ko@li.org>\n" @@ -2601,7 +2601,7 @@ msgstr "%s: rpmWriteSignatureÀÌ ½ÇÆÐÇß½À´Ï´Ù: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLeadÀÌ ½ÇÆÐÇß½À´Ï´Ù\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -2581,7 +2581,7 @@ msgstr "%s: rpmWriteSignature feilet: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead feilet\n" #: lib/rpmchecksig.c:608 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.3-20030515\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2003-06-08 22:42+0200\n" "Last-Translator: Arkadiusz Miskiewicz <arekm@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -2573,8 +2573,8 @@ msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature nie powiod³o siê: %s\n" #: lib/rpmchecksig.c:596 -#, c-format -msgid "%s: import read failed.\n" +#, fuzzy, c-format +msgid "%s: import read failed(%d).\n" msgstr "%s: read przy imporcie nie powiod³o siê.\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n" "Language-Team: pt <morais@kde.org\n" @@ -2612,7 +2612,7 @@ msgstr "%s: o rpmWriteSignature falhou: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr ":%s: o readLead falhou\n" #: lib/rpmchecksig.c:608 diff --git a/po/pt_BR.po b/po/pt_BR.po index 7ececd26e..acd4406c5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2004-02-29 07:48+0500\n" "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n" "Language-Team: Brazilian Portuguese\n" @@ -2804,7 +2804,7 @@ msgstr "No consegui abrir: %s\n" # , c-format #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "No consegui abrir: %s\n" # , c-format @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -2517,7 +2517,7 @@ msgstr "" #: lib/rpmchecksig.c:596 #, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "" #: lib/rpmchecksig.c:608 diff --git a/po/rpm.pot b/po/rpm.pot index 0b3de9694..493ccf98d 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\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" @@ -2523,7 +2523,7 @@ msgstr "" #: lib/rpmchecksig.c:596 #, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -2585,8 +2585,8 @@ msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n" #: lib/rpmchecksig.c:596 -#, c-format -msgid "%s: import read failed.\n" +#, fuzzy, c-format +msgid "%s: import read failed(%d).\n" msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ×Ï ×ÒÅÍÑ ÉÍÐÏÒÔÉÒÏ×ÁÎÉÑ.\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" @@ -2660,7 +2660,7 @@ msgstr "%s: rpmReadSignature zlyhalo\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead zlyhalo\n" #: lib/rpmchecksig.c:608 @@ -1,13 +1,13 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000. -# $Id: sl.po,v 1.389.2.4 2004/11/29 14:32:17 jbj Exp $ +# $Id: sl.po,v 1.389.2.5 2004/12/05 19:10:57 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -2661,7 +2661,7 @@ msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead je bil neuspe¹en\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2004-02-29 07:48+0500\n" "Last-Translator: unknown\n" "Language-Team: unknown\n" @@ -2654,7 +2654,7 @@ msgstr "%s: Neuspelo 'rpmReadSignature'\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: Neuspeo 'readLead'\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2003-02-05 12:40+0100\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -2573,8 +2573,8 @@ msgid "%s: rpmWriteSignature failed: %s\n" msgstr "%s: rpmWriteSignature misslyckades: %s\n" #: lib/rpmchecksig.c:596 -#, c-format -msgid "%s: import read failed.\n" +#, fuzzy, c-format +msgid "%s: import read failed(%d).\n" msgstr "%s: importläsning misslyckades.\n" #: lib/rpmchecksig.c:608 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-11-29 09:30-0500\n" +"POT-Creation-Date: 2004-12-05 14:08-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -2628,7 +2628,7 @@ msgstr "%s: rpmWriteSignature baþarýsýz: %s\n" #: lib/rpmchecksig.c:596 #, fuzzy, c-format -msgid "%s: import read failed.\n" +msgid "%s: import read failed(%d).\n" msgstr "%s: readLead baþarýsýz\n" #: lib/rpmchecksig.c:608 diff --git a/rpm.spec.in b/rpm.spec.in index ea940fbc9..3427b522a 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -20,7 +20,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.9 +Release: 1 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz License: GPL @@ -495,6 +495,9 @@ exit 0 %{__includedir}/popt.h %changelog +* Sun Dec 5 2004 Jeff Johnson <jbj@jbj.org> 4.4-1 +- rpm-4.4 final release. + * Mon Nov 29 2004 Jeff Johnson <jbj@jbj.org> 4.4-0.9 - detect and return errors from neon through Ferror. |