From edc0ad3152685cdf284953c2618bc895e9025d01 Mon Sep 17 00:00:00 2001 From: jbj Date: Sun, 5 Dec 2004 19:10:53 +0000 Subject: [PATCH] - rpm-4.4 final release. CVS patchset: 7627 CVS date: 2004/12/05 19:10:53 --- lib/rpmchecksig.c | 2 +- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/fi.po | 4 ++-- po/fr.po | 6 +++--- po/gl.po | 4 ++-- po/is.po | 4 ++-- po/ja.po | 4 ++-- po/ko.po | 4 ++-- po/no.po | 4 ++-- po/pl.po | 6 +++--- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ro.po | 4 ++-- po/rpm.pot | 4 ++-- po/ru.po | 6 +++--- po/sk.po | 4 ++-- po/sl.po | 6 +++--- po/sr.po | 4 ++-- po/sv.po | 6 +++--- po/tr.po | 4 ++-- rpm.spec.in | 5 ++++- 23 files changed, 52 insertions(+), 49 deletions(-) diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 416ea49..bbb4596 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; } diff --git a/po/cs.po b/po/cs.po index 2c7dfe5..acaa01e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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 \n" "Language-Team: Czech \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 diff --git a/po/da.po b/po/da.po index e0a014e..6546925 100644 --- a/po/da.po +++ b/po/da.po @@ -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 \n" "Language-Team: Danish \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 diff --git a/po/de.po b/po/de.po index 72c5f69..a727b60 100644 --- a/po/de.po +++ b/po/de.po @@ -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 \n" "Language-Team: German \n" @@ -2784,7 +2784,7 @@ msgstr "%s: #: 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 diff --git a/po/fi.po b/po/fi.po index bfc95a2..c08e3d5 100644 --- a/po/fi.po +++ b/po/fi.po @@ -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 \n" "Language-Team: Finnish \n" @@ -2660,7 +2660,7 @@ msgstr "%s: rpmReadSignature ep #: 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 diff --git a/po/fr.po b/po/fr.po index 14a0d2a..2838b27 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 \n" "Language-Team: RPM French Translation \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 diff --git a/po/gl.po b/po/gl.po index 42c4dcd..3149401 100644 --- a/po/gl.po +++ b/po/gl.po @@ -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 \n" "Language-Team: Galician \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/is.po b/po/is.po index a1bcb30..6fd0c64 100644 --- a/po/is.po +++ b/po/is.po @@ -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 \n" "Language-Team: 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 diff --git a/po/ja.po b/po/ja.po index b05febc..3cc4e0c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 \n" "Language-Team: JRPM \n" @@ -2693,7 +2693,7 @@ msgstr "%s: rpmWriteSignature #: 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 diff --git a/po/ko.po b/po/ko.po index 2d77d8e..4a59650 100644 --- a/po/ko.po +++ b/po/ko.po @@ -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 \n" "Language-Team: GNU Translation project \n" @@ -2601,7 +2601,7 @@ msgstr "%s: rpmWriteSignature #: 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 diff --git a/po/no.po b/po/no.po index 0202ad4..a97cb74 100644 --- a/po/no.po +++ b/po/no.po @@ -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 \n" "Language-Team: Norwegian \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 diff --git a/po/pl.po b/po/pl.po index 0711277..cd3391b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -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 \n" "Language-Team: Polish \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 diff --git a/po/pt.po b/po/pt.po index 55392aa..14c4d23 100644 --- a/po/pt.po +++ b/po/pt.po @@ -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 \n" "Language-Team: pt \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 diff --git a/po/ro.po b/po/ro.po index 94e4a92..c5aeb28 100644 --- a/po/ro.po +++ b/po/ro.po @@ -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 \n" "Language-Team: Romanian \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 0b3de96..493ccf9 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 \n" "Language-Team: LANGUAGE \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 diff --git a/po/ru.po b/po/ru.po index 17a87cd..c3bd299 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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, \n" "Language-Team: Black Cat Linux Team \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 diff --git a/po/sk.po b/po/sk.po index 2950ce6..4f2b295 100644 --- a/po/sk.po +++ b/po/sk.po @@ -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 \n" "Language-Team: Slovak \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 diff --git a/po/sl.po b/po/sl.po index ac11c24..79326b2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 , 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 \n" "Language-Team: Slovenian \n" @@ -2661,7 +2661,7 @@ msgstr "%s: rpmWriteSignature je bilo neuspe #: 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 diff --git a/po/sr.po b/po/sr.po index 8875ab2..4453060 100644 --- a/po/sr.po +++ b/po/sr.po @@ -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 diff --git a/po/sv.po b/po/sv.po index 0b9f73c..d5532b8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -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 \n" "Language-Team: Swedish \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 diff --git a/po/tr.po b/po/tr.po index bb8cd81..1bf3e40 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 \n" "Language-Team: Turkish \n" @@ -2628,7 +2628,7 @@ msgstr "%s: rpmWriteSignature ba #: 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 ea940fb..3427b52 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 4.4-1 +- rpm-4.4 final release. + * Mon Nov 29 2004 Jeff Johnson 4.4-0.9 - detect and return errors from neon through Ferror. -- 2.7.4