[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.29-1-g0a88cd1
by Werner Koch
cvs at cvs.gnupg.org
Tue Sep 8 16:44:58 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, STABLE-BRANCH-2-0 has been updated
via 0a88cd186f2943eb5ff6839ce0299d313c1d958d (commit)
via 120fc695209fed9b447a72d36a9f7563e7b77a68 (commit)
via 88deb88741f062098e726527450bfcf16f11848d (commit)
via 12835e034b35781eac53a73a62d4e71960a14e64 (commit)
via 89cce4cbbbbb8c08d3db0021c5f90ef480f54e47 (commit)
via 77f2964b9602fb463738d14bd957d967a0c1b5ac (commit)
via 0b01bb7f253fc1f9422e59dc475fa86854b46f69 (commit)
from 60b0403f3ce50ee6f67fa94bf0342fb5b3988e2b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0a88cd186f2943eb5ff6839ce0299d313c1d958d
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 8 16:41:38 2015 +0200
Post release updates.
--
diff --git a/NEWS b/NEWS
index 14ab547..ef93593 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Noteworthy changes in version 2.0.30 (unreleased)
+-------------------------------------------------
+
Noteworthy changes in version 2.0.29 (2015-09-08)
-------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 665c2b7..e5b8baf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.14"
# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.29])
+m4_define([mym4_version], [2.0.30])
# Below is m4 magic to extract and compute the git revision number,
# the decimalized short revision number, a beta version string and a
commit 120fc695209fed9b447a72d36a9f7563e7b77a68
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 8 15:59:00 2015 +0200
Release 2.0.29.
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/AUTHORS b/AUTHORS
index 323954b..9b57c16 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -183,10 +183,8 @@ name gpg2keys_*.
=========
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007, 2008, 2009, 2010, 2011,
- 2012, 2013 Free Software Foundation, Inc.
- Copyright 1997, 1998, 2013, 2014 Werner Koch
+ Copyright 1997-2015 Werner Koch
+ Copyright 1998-2013 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
diff --git a/NEWS b/NEWS
index 6347c5c..14ab547 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,18 @@
-Noteworthy changes in version 2.0.29 (unreleased)
+Noteworthy changes in version 2.0.29 (2015-09-08)
-------------------------------------------------
+ * gpg: Print a PGP-2 fingerprint again instead of a row of "0".
+
+ * gpg: Fixed a race condition from multiple several "gpg --verify".
+
+ * gpg: Print FAILURE status lines to help GPGME.
+
+ * gpgsm: Fixed a regression in CSR generation.
+
+ * scdaemon: Fixed problems with some pinpads.
+
+ * Fixed a few other bugs.
+
Noteworthy changes in version 2.0.28 (2015-06-02)
-------------------------------------------------
diff --git a/README b/README
index a33598e..a031c5e 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
=======================
Version 2.0
+ Copyright 1997-2015 Werner Koch
Copyright 1998-2015 Free Software Foundation, Inc.
- Copyright 1997-1998, 2013-2015 Werner Koch
INTRODUCTION
diff --git a/g10/gpg.c b/g10/gpg.c
index 4f71bf4..97975fb 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1,6 +1,7 @@
/* gpg.c - The GnuPG utility (main for gpg)
- * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- * 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 1998-2011 Free Software Foundation, Inc.
+ * Copyright (C) 1997-2015 Werner Koch
+ * Copyright (C) 2015 g10 Code GmbH
*
* This file is part of GnuPG.
*
commit 88deb88741f062098e726527450bfcf16f11848d
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 8 15:58:28 2015 +0200
po: Auto-update.
--
diff --git a/po/be.po b/po/be.po
index 2478aef..606b297 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3782,6 +3782,10 @@ msgstr ""
msgid " Key fingerprint ="
msgstr "паказаць ключы й адбіткі пальцаў"
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "нерÑчаіÑны Ñ…Ñш-альгарытм \"%s\"\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -4876,6 +4880,14 @@ msgstr "памылка Ñ‡Ñ‹Ñ‚Ð°Ð½ÑŒÐ½Ñ Ñ„Ð°Ð¹Ð»Ð°"
msgid "trustdb: sync failed: %s\n"
msgstr ""
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "немагчыма адкрыць \"%s\"\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
@@ -4895,14 +4907,6 @@ msgstr "немагчыма адкрыць %s: %s\n"
msgid "%s: directory does not exist!\n"
msgstr ""
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "%s: немагчыма Ñтварыць Ñ‚Ñчку: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "немагчыма адкрыць \"%s\"\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index bf9b79d..86eb364 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4141,6 +4141,10 @@ msgstr " Empremta digital de la subclau:"
msgid " Key fingerprint ="
msgstr " Empremta digital ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5353,6 +5357,14 @@ msgstr "error de lectura: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "no es pot crear el directori «%s»: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "no s'ha pogut obrir «%s»\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
@@ -5375,14 +5387,6 @@ msgstr "no s'ha pogut tancar «%s»: %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: el directori no existeix!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "no es pot crear el directori «%s»: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "no s'ha pogut obrir «%s»\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: no s'ha pogut crear un registre de versió: %s"
diff --git a/po/cs.po b/po/cs.po
index 15a90d9..0aaabcb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3873,6 +3873,11 @@ msgstr " Otisk podklÃÄe:"
msgid " Key fingerprint ="
msgstr " Otisk klÃÄe ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "VAROVÃNÃ: použÃvám experimentálnà hashovacà algoritmus %s\n"
+
msgid " Card serial no. ="
msgstr " Sériové ÄÃslo karty ="
@@ -5016,6 +5021,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "databáze důvěry: synchronizace selhala %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "nemohu vytvořit zámek pro „%s“\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "nelze zamknout „%s“\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "záznam v databázi důvěry %lu: lseek() se nepodařil: %s\n"
@@ -5035,14 +5048,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: adresář neexistuje!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "nemohu vytvořit zámek pro „%s“\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "nelze zamknout „%s“\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
diff --git a/po/da.po b/po/da.po
index 0d5c736..06d9ab0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3856,6 +3856,11 @@ msgstr " Undernøglefingeraftryk:"
msgid " Key fingerprint ="
msgstr " Nøglefingeraftryk ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "ADVARSEL: bruger eksperimentel sammendragsalgoritme %s\n"
+
msgid " Card serial no. ="
msgstr " Serielnr. for kort ="
@@ -5000,6 +5005,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronisering mislykkedes: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "kan ikke oprette lås for »%s«\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "kan ikke låse »%s«\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
@@ -5019,14 +5032,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: mappe findes ikke!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "kan ikke oprette lås for »%s«\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "kan ikke låse »%s«\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: kunne ikke oprette versionspost: %s"
diff --git a/po/el.po b/po/el.po
index e094b07..b55f03a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4047,6 +4047,10 @@ msgstr "
msgid " Key fingerprint ="
msgstr " Áðïôýðùìá êëåéäéïý ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%s õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5231,6 +5235,14 @@ msgstr "
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync áðÝôõ÷å: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: áðïôõ÷ßá lseek: %s\n"
@@ -5250,14 +5262,6 @@ msgstr "
msgid "%s: directory does not exist!\n"
msgstr "%s: ï öÜêåëïò äåí õðÜñ÷åé!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "áäõíáìßá äçìéïõñãßáò ôïõ `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "áäõíáìßá ðñüóâáóçò ôïõ `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: áðïôõ÷ßá äçìéïõñãßáò ìéáò åããñáöÞò Ýêäïóçò: %s"
diff --git a/po/eo.po b/po/eo.po
index a6e7818..8fc95a9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -4026,6 +4026,10 @@ msgstr "
msgid " Key fingerprint ="
msgstr " Þlosilo-fingrospuro ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%s-subskribo de: %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5186,6 +5190,14 @@ msgstr "kiraso: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "fido-datenaro: sync malsukcesis: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "ne povas krei '%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "ne povas malfermi '%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
@@ -5205,14 +5217,6 @@ msgstr "ne povas fermi '%s': %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: dosierujo ne ekzistas!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "ne povas krei '%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "ne povas malfermi '%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: malsukcesis krei versiregistron: %s"
diff --git a/po/es.po b/po/es.po
index 7fe8148..33330d2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3873,6 +3873,11 @@ msgstr " Huella de subclave:"
msgid " Key fingerprint ="
msgstr " Huella de clave ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "ATENCIÓN: usando algoritmo de resumen experimental %s\n"
+
msgid " Card serial no. ="
msgstr " Número de serie de la tarjeta ="
@@ -5020,6 +5025,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallo sincronización: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "no se puede crear el bloqueo para `%s'\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "no se puede bloquear `%s'\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
@@ -5040,14 +5053,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: ¡el directorio no existe!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "no se puede crear el bloqueo para `%s'\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "no se puede bloquear `%s'\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: fallo en la creación del registro de versión: %s"
diff --git a/po/et.po b/po/et.po
index ba781a7..d18984e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3994,6 +3994,10 @@ msgstr " Alamv
msgid " Key fingerprint ="
msgstr " Võtme sõrmejälg ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5153,6 +5157,14 @@ msgstr "viga lugemisel: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync ebaõnnestus: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "`%s' ei õnnestu luua: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "`%s' ei õnnestu avada\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
@@ -5172,14 +5184,6 @@ msgstr "`%s' ei
msgid "%s: directory does not exist!\n"
msgstr "%s: kataloogi ei ole!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "`%s' ei õnnestu avada\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versioonikirje loomine ei õnnestu: %s"
diff --git a/po/fi.po b/po/fi.po
index 6b3d566..85e042e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4030,6 +4030,11 @@ msgstr " Aliavaimen sormenjälki:"
msgid " Key fingerprint ="
msgstr " Avaimen sormenjälki ="
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5216,6 +5221,14 @@ msgstr "lukuvirhe: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: synkronointi epäonnistui: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "tiedostoa \"%s\" ei voi avata\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
@@ -5235,14 +5248,6 @@ msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: hakemistoa ei ole olemassa!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "tiedostoa \"%s\" ei voi avata\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: versiotietueen luonti epäonnistui: %s"
diff --git a/po/fr.po b/po/fr.po
index a640f2e..b0775c9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3942,6 +3942,11 @@ msgstr " Empreinte de sous-clef :"
msgid " Key fingerprint ="
msgstr " Empreinte de la clef ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "Attention : utilisation de l'algorithme expérimental de hachage %s\n"
+
msgid " Card serial no. ="
msgstr " Nº de série de carte ="
@@ -5137,6 +5142,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "base de confiance : échec de synchronisation : %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "impossible de créer un verrou pour « %s »\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "impossible de verrouiller « %s »\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "enregistrement de base de confiance %lu : échec de lseek : %s\n"
@@ -5157,14 +5170,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s : le répertoire n'existe pas.\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "impossible de créer un verrou pour « %s »\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "impossible de verrouiller « %s »\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s : impossible de créer un enregistrement de version : %s"
diff --git a/po/gl.po b/po/gl.po
index 3c62fc8..f675ea7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4044,6 +4044,10 @@ msgstr " Pegada dactilar da sub-chave:"
msgid " Key fingerprint ="
msgstr " Pegada dactilar ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5219,6 +5223,14 @@ msgstr "erro de lectura: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "base de datos de confianza: fallou a sincronización: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "non se pode crear `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "non se puido abrir `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
@@ -5239,14 +5251,6 @@ msgstr "non se pode pechar `%s': %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: ¡o directorio non existe!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "non se pode crear `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "non se puido abrir `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: non se puido crea-lo rexistro de versión: %s"
diff --git a/po/hu.po b/po/hu.po
index f763ca5..a43f640 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4003,6 +4003,10 @@ msgstr " Alkulcsujjlenyomat:"
msgid " Key fingerprint ="
msgstr " Kulcs ujjlenyomata ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5184,6 +5188,14 @@ msgstr "Olvas
msgid "trustdb: sync failed: %s\n"
msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "Nem tudom megnyitni %s-t!\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n"
@@ -5203,14 +5215,6 @@ msgstr "Nem tudom bez
msgid "%s: directory does not exist!\n"
msgstr "%s: Könyvtár nem létezik!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "Nem tudom megnyitni %s-t!\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s"
diff --git a/po/id.po b/po/id.po
index 53d8174..5238a4b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -4017,6 +4017,10 @@ msgstr " Fingerprint subkunci ="
msgid " Key fingerprint ="
msgstr " Fingerprint kunci ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%s signature, algoritma digest %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5182,6 +5186,14 @@ msgstr "kesalahan pembacaan: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: gagal sync: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "tidak dapat membuat %s: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "tidak dapat membuka `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek gagal: %s\n"
@@ -5201,14 +5213,6 @@ msgstr "tidak dapat menutup `%s': %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: direktori tidak ada!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "tidak dapat membuat %s: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "tidak dapat membuka `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: gagal membuat catatan versi: %s"
diff --git a/po/it.po b/po/it.po
index dc61449..0612633 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4030,6 +4030,10 @@ msgstr " Impronta digitale della subchiave:"
msgid " Key fingerprint ="
msgstr " Impronta digitale ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5222,6 +5226,14 @@ msgstr "errore di lettura: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sync fallita: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "impossibile creare `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "impossibile aprire `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek fallita: %s\n"
@@ -5241,14 +5253,6 @@ msgstr "impossibile chiudere `%s': %s\n"
msgid "%s: directory does not exist!\n"
msgstr "%s: la directory non esiste!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "impossibile creare `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "impossibile aprire `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: creazione del record della versione fallita: %s"
diff --git a/po/ja.po b/po/ja.po
index 31ffef0..d5415cd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3775,6 +3775,11 @@ msgstr "副éµãƒ•ã‚£ãƒ³ã‚¬ãƒ¼ãƒ»ãƒ—リント:"
msgid " Key fingerprint ="
msgstr " フィンガー・プリント ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "*è¦å‘Š*: 実験的ダイジェスト・アルゴリズム%sを使用\n"
+
msgid " Card serial no. ="
msgstr " ã‚«ãƒ¼ãƒ‰ãƒ»ã‚·ãƒªã‚¢ãƒ«ç•ªå· ="
@@ -4891,6 +4896,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "信用データベース: åŒæœŸã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "「%sã€ã®ãƒãƒƒã‚¯ã‚’作æˆã§ãã¾ã›ã‚“\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "「%sã€ãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信用データベース レコード%lu: シークã«å¤±æ•—ã—ã¾ã—ãŸ: %s\n"
@@ -4910,14 +4923,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: ディレクトリãŒã‚ã‚Šã¾ã›ã‚“!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "「%sã€ã®ãƒãƒƒã‚¯ã‚’作æˆã§ãã¾ã›ã‚“\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "「%sã€ãŒãƒãƒƒã‚¯ã§ãã¾ã›ã‚“\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãƒ»ãƒ¬ã‚³ãƒ¼ãƒ‰ã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ: %s"
diff --git a/po/nb.po b/po/nb.po
index 98fbbc2..f7a3a1b 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3844,6 +3844,11 @@ msgstr " Fingeravstrykk for undern
msgid " Key fingerprint ="
msgstr " Nøkkelfingeravtrykk ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
+
msgid " Card serial no. ="
msgstr " Serienummer for kort ="
@@ -4955,6 +4960,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr ""
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "kan ikke opprette lås for «%s»\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "kan ikke låse «%s»\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
@@ -4974,14 +4987,6 @@ msgid "%s: directory does not exist!\n"
msgstr ""
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "kan ikke opprette lås for «%s»\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "kan ikke låse «%s»\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index f2a839c..bf40d9f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3987,6 +3987,11 @@ msgstr " Vingerafdruk van de subsleutel:"
msgid " Key fingerprint ="
msgstr " Vingerafdruk van de sleutel ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "WAARSCHUWING: er wordt een experimenteel hashalgoritme %s gebruikt\n"
+
msgid " Card serial no. ="
msgstr " Serienummer van de kaart ="
@@ -5187,6 +5192,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "betrouwbaarheidsdatabank (trustdb): synchronisatie mislukt: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "kan geen grendel maken voor `%s'\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "kan `%s' niet vergrendelen\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr ""
"betrouwbaarheidsdatabank (trustdb): element %lu: lseek is mislukt: %s\n"
@@ -5209,14 +5222,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: map bestaat niet!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "kan geen grendel maken voor `%s'\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "kan `%s' niet vergrendelen\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: het registreren van de versie is mislukt: %s"
diff --git a/po/pl.po b/po/pl.po
index f1efab6..331510c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3882,6 +3882,11 @@ msgstr " Odcisk podklucza:"
msgid " Key fingerprint ="
msgstr " Odcisk klucza ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "OSTRZEŻENIE: użycie eksperymentalnego algorytmu skrótu %s\n"
+
msgid " Card serial no. ="
msgstr " Nr seryjny karty ="
@@ -5038,6 +5043,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "nie można utworzyć blokady dla ,,%s''\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "nie można zablokować ,,%s''\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiodła się: %s\n"
@@ -5057,14 +5070,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: katalog nie istnieje!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "nie można utworzyć blokady dla ,,%s''\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "nie można zablokować ,,%s''\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: stworzenie zapisu o wersji nie powiodło się: %s"
diff --git a/po/pt.po b/po/pt.po
index 1ebd6ab..d51a531 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4016,6 +4016,10 @@ msgstr " Impress
msgid " Key fingerprint ="
msgstr " Impressão da chave ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5184,6 +5188,14 @@ msgstr "armadura: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "base de dados de confiança: sincronização falhou: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "impossível criar `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "impossível abrir `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "base de dados de confiança rec %lu: lseek falhou: %s\n"
@@ -5203,14 +5215,6 @@ msgstr "imposs
msgid "%s: directory does not exist!\n"
msgstr "%s: diretoria inexistente!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "impossível criar `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "impossível abrir `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registo de versão: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 579ea19..f74ef0f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4032,6 +4032,10 @@ msgstr " Impress
msgid " Key fingerprint ="
msgstr " Impressão digital:"
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "assinatura %s de: %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5194,6 +5198,14 @@ msgstr "erro de leitura: %s\n"
msgid "trustdb: sync failed: %s\n"
msgstr "banco de dados de confiabilidade: sincronização falhou: %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "impossível criar %s: %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "impossível abrir `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
@@ -5213,14 +5225,6 @@ msgstr "imposs
msgid "%s: directory does not exist!\n"
msgstr "%s: diretório inexistente!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "impossível criar %s: %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "impossível abrir `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: falha ao criar registro de versão: %s"
diff --git a/po/ro.po b/po/ro.po
index 5ddab61..be90de5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3940,6 +3940,11 @@ msgstr " Amprent
msgid " Key fingerprint ="
msgstr " Amprentã cheie ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
+
msgid " Card serial no. ="
msgstr " Card nr. serie ="
@@ -5095,6 +5100,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: sincronizarea a eºuat: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "nu pot încuia (lock) `%s'\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb rec %lu: lseek a eºuat: %s\n"
@@ -5114,14 +5127,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: directorul nu existã!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "nu pot încuia (lock) `%s'\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: am eºuat sã creez înregistrare versiune: %s"
diff --git a/po/ru.po b/po/ru.po
index 3cf9dc0..a5156be 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4979,6 +4979,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "таблица довериÑ: Ñбой Ñинхронизации: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "невозможно Ñоздать блокировку Ð´Ð»Ñ `%s'\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "невозможно заблокировать `%s'\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "таблица довериÑ, запиÑÑŒ %lu: Ñбой lseek: %s\n"
@@ -4998,14 +5006,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: каталог не ÑущеÑтвует!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "невозможно Ñоздать блокировку Ð´Ð»Ñ `%s'\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "невозможно заблокировать `%s'\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Ñбой ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð·Ð°Ð¿Ð¸Ñи о верÑии: %s"
diff --git a/po/sk.po b/po/sk.po
index 23bac58..9d5feb9 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4024,6 +4024,10 @@ msgstr " Fingerprint podk
msgid " Key fingerprint ="
msgstr " Fingerprint kµúèa ="
+#, fuzzy, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "%s podpis, hashovací algoritmus %s\n"
+
msgid " Card serial no. ="
msgstr ""
@@ -5200,6 +5204,14 @@ msgstr "chyba pri
msgid "trustdb: sync failed: %s\n"
msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
+#, fuzzy, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "nemô¾em vytvori» `%s': %s\n"
+
+#, fuzzy, c-format
+msgid "can't lock `%s'\n"
+msgstr "nemo¾no otvori» `%s'\n"
+
#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "záznam v databáze dôvery %lu: lseek() sa nepodaril: %s\n"
@@ -5219,14 +5231,6 @@ msgstr "nem
msgid "%s: directory does not exist!\n"
msgstr "%s: adresár neexistuje!\n"
-#, fuzzy, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "nemô¾em vytvori» `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "can't lock `%s'\n"
-msgstr "nemo¾no otvori» `%s'\n"
-
#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: nepodarilo sa vytvori» záznam verzie: %s"
diff --git a/po/sv.po b/po/sv.po
index 3e8b6cd..0817012 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3950,6 +3950,11 @@ msgstr " Undernyckelns fingeravtryck:"
msgid " Key fingerprint ="
msgstr "Nyckelns fingeravtryck ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
+
msgid " Card serial no. ="
msgstr " Kortets serienr ="
@@ -5129,6 +5134,15 @@ msgid "trustdb: sync failed: %s\n"
msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "kan inte skapa lås för \"%s\"\n"
+
+# se förra kommentaren
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "kan inte låsa \"%s\"\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
@@ -5148,15 +5162,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: katalogen finns inte!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "kan inte skapa lås för \"%s\"\n"
-
-# se förra kommentaren
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "kan inte låsa \"%s\"\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: misslyckades med att skapa versionspost: %s"
diff --git a/po/tr.po b/po/tr.po
index 889f532..eb8af01 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3912,6 +3912,11 @@ msgstr "Yardımcı anahtar parmak izi:"
msgid " Key fingerprint ="
msgstr " Anahtar parmakizi ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
+
msgid " Card serial no. ="
msgstr " Kart seri no. ="
@@ -5065,6 +5070,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "`%s' için kilit oluşturulamıyor\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "`%s' kiltlenemedi\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
@@ -5084,14 +5097,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: dizin yok!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "`%s' için kilit oluşturulamıyor\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "`%s' kiltlenemedi\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
diff --git a/po/uk.po b/po/uk.po
index 77998ae..1ad8d81 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3915,6 +3915,13 @@ msgstr " Відбиток підключа:"
msgid " Key fingerprint ="
msgstr " Відбиток ключа ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr ""
+"УВÐГÐ: викориÑтовуємо екÑпериментальний алгоритм обчиÑÐ»ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¸Ñ… Ñум "
+"%s\n"
+
msgid " Card serial no. ="
msgstr "Серійний номер картки ="
@@ -5074,6 +5081,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "trustdb: помилка Ñинхронізації: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "не вдалоÑÑ Ñтворити Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Â«%s»\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "не вдалоÑÑ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ «%s»\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "Ð·Ð°Ð¿Ð¸Ñ trustdb %lu: помилка lseek: %s\n"
@@ -5093,14 +5108,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: каталогу не Ñ–Ñнує!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "не вдалоÑÑ Ñтворити Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Â«%s»\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "не вдалоÑÑ Ð·Ð°Ð±Ð»Ð¾ÐºÑƒÐ²Ð°Ñ‚Ð¸ «%s»\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: не вдалоÑÑ Ñтворити Ð·Ð°Ð¿Ð¸Ñ Ñ‰Ð¾Ð´Ð¾ верÑÑ–Ñ—: %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ab5db7..20f44b9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3835,6 +3835,11 @@ msgstr " å钥指纹："
msgid " Key fingerprint ="
msgstr "密钥指纹 ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "è¦å‘Šï¼šä½¿ç”¨è¯•éªŒæ€§è´¨çš„散列算法 %s\n"
+
msgid " Card serial no. ="
msgstr "å¡åºåˆ—å· ="
@@ -4934,6 +4939,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "信任度数æ®åº“：åŒæ¥å¤±è´¥ï¼š%s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "ä¸èƒ½ä¸ºâ€˜%s’创建é”定\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "æ— æ³•é”定‘%s’\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任度数æ®åº“记录 %lu：lseek 失败：%s\n"
@@ -4953,14 +4966,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s：目录ä¸å˜åœ¨ï¼\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "ä¸èƒ½ä¸ºâ€˜%s’创建é”定\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "æ— æ³•é”定‘%s’\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s：建立版本记录失败：%s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f8192f6..c1319a0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3759,6 +3759,11 @@ msgstr " å鑰指紋:"
msgid " Key fingerprint ="
msgstr " 金鑰指紋 ="
+#, fuzzy, c-format
+#| msgid "WARNING: using experimental digest algorithm %s\n"
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "è¦å‘Š: æ£åœ¨ä½¿ç”¨å¯¦é©—性的 %s 摘è¦æ¼”算法\n"
+
msgid " Card serial no. ="
msgstr " å¡ç‰‡åºè™Ÿ ="
@@ -4861,6 +4866,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "信任資料庫: åŒæ¥åŒ–失敗: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "無法為 `%s' 建立鎖定\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "無法鎖定 `%s'\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "信任資料庫記錄 %lu: 本機æœå°‹å¤±æ•—: %s\n"
@@ -4880,14 +4893,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: 目錄ä¸å˜åœ¨!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "無法為 `%s' 建立鎖定\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "無法鎖定 `%s'\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: 建立版本記錄失敗: %s"
commit 12835e034b35781eac53a73a62d4e71960a14e64
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 8 15:57:44 2015 +0200
po: Update German translation
--
diff --git a/po/de.po b/po/de.po
index 681c6de..839868b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnupg-2.0.18\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-06-02 13:13+0200\n"
+"PO-Revision-Date: 2015-09-08 15:57+0200\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: German <de at li.org>\n"
"Language: de\n"
@@ -3915,6 +3915,10 @@ msgstr " Unter-Fingerabdruck ="
msgid " Key fingerprint ="
msgstr " Schl.-Fingerabdruck ="
+#, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "WARNUNG: Ein PGP-2 Fingerabdruck ist unsicher\n"
+
msgid " Card serial no. ="
msgstr " Kartenseriennr. ="
@@ -5102,6 +5106,14 @@ msgid "trustdb: sync failed: %s\n"
msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
#, c-format
+msgid "can't create lock for `%s'\n"
+msgstr "Datei `%s' konnte nicht gesperrt werden\n"
+
+#, c-format
+msgid "can't lock `%s'\n"
+msgstr "'%s' kann nicht gesperrt werden\n"
+
+#, c-format
msgid "trustdb rec %lu: lseek failed: %s\n"
msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
@@ -5121,14 +5133,6 @@ msgid "%s: directory does not exist!\n"
msgstr "%s: Verzeichnis existiert nicht!\n"
#, c-format
-msgid "can't create lock for `%s'\n"
-msgstr "Datei `%s' konnte nicht gesperrt werden\n"
-
-#, c-format
-msgid "can't lock `%s'\n"
-msgstr "'%s' kann nicht gesperrt werden\n"
-
-#, c-format
msgid "%s: failed to create version record: %s"
msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
commit 89cce4cbbbbb8c08d3db0021c5f90ef480f54e47
Author: Ineiev <ineiev at gnu.org>
Date: Tue Sep 8 15:54:38 2015 +0200
po: Update Russian translation.
--
diff --git a/po/ru.po b/po/ru.po
index 7341334..3cf9dc0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GnuPG 2.0.10\n"
"Report-Msgid-Bugs-To: translations at gnupg.org\n"
-"PO-Revision-Date: 2015-02-14 17:16+0000\n"
+"PO-Revision-Date: 2015-06-25 17:16+0000\n"
"Last-Translator: Ineiev <ineiev at gnu.org>\n"
"Language-Team: Russian <gnupg-ru at gnupg.org>\n"
"Language: ru\n"
@@ -36,36 +36,26 @@ msgstr "|pinentry-label|_OK"
msgid "|pinentry-label|_Cancel"
msgstr "|pinentry-label|Отмена (_C)"
-#, fuzzy
-#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_Yes"
-msgstr "|pinentry-label|_OK"
+msgstr "|pinentry-label|Да (_Y)"
-#, fuzzy
-#| msgid "|pinentry-label|_OK"
msgid "|pinentry-label|_No"
-msgstr "|pinentry-label|_OK"
+msgstr "|pinentry-label|Ðет (_N)"
msgid "|pinentry-label|PIN:"
msgstr "|pinentry-label|PIN:"
-#, fuzzy
-#| msgid "|pinentry-label|_Cancel"
msgid "|pinentry-label|_Save in password manager"
-msgstr "|pinentry-label|Отмена (_C)"
+msgstr "|pinentry-label|Сохранить в диÑпетчере паролей (_S)"
-#, fuzzy
-#| msgid "Do you really want to revoke the selected subkeys? (y/N) "
msgid "Do you really want to make your passphrase visible on the screen?"
-msgstr "Ð’Ñ‹ дейÑтвительно хотите отозвать выбранные подключи? (y/N) "
+msgstr "Ð’Ñ‹ дейÑтвительно хотите, чтобы фраза-пароль была видна на Ñкране?"
msgid "|pinentry-tt|Make passphrase visible"
-msgstr ""
+msgstr "|pinentry-tt|Показывать фразу-пароль"
-#, fuzzy
-#| msgid "Enter new passphrase"
msgid "|pinentry-tt|Hide passphrase"
-msgstr "Введите новую фразу-пароль"
+msgstr "|pinentry-tt|Скрывать фразу-пароль"
#. TRANSLATORS: This string is displayed by Pinentry as the label
#. for the quality bar.
@@ -391,10 +381,8 @@ msgstr "включить поддержку ssh"
msgid "enable putty support"
msgstr "включить поддержку putty"
-#, fuzzy
-#| msgid "do not allow the reuse of old passphrases"
msgid "disallow the use of an external password cache"
-msgstr "не разрешать повторное иÑпользование Ñтарых фраз-паролей"
+msgstr "не позволÑÑ‚ÑŒ пользоватьÑÑ Ð²Ð½ÐµÑˆÐ½ÐµÐ¹ памÑтью паролей"
msgid "|FILE|write environment settings also to FILE"
msgstr "|FILE|Ñохранить ÑоÑтоÑние Ñреды также в файл FILE"
@@ -3844,6 +3832,10 @@ msgstr " Отпечаток подключа:"
msgid " Key fingerprint ="
msgstr " Отпечаток ключа ="
+#, c-format
+msgid "WARNING: a PGP-2 fingerprint is not safe\n"
+msgstr "Ð’ÐИМÐÐИЕ: отпечаток PGP-2 не безопаÑен\n"
+
msgid " Card serial no. ="
msgstr " Ñерийный номер карты ="
@@ -5269,10 +5261,8 @@ msgstr "ключевое Ñлово Ñлишком длинное"
msgid "missing argument"
msgstr "пропущен аргумент"
-#, fuzzy
-#| msgid "invalid value\n"
msgid "invalid argument"
-msgstr "недопуÑтимое значение\n"
+msgstr "недопуÑтимый аргумент"
msgid "invalid command"
msgstr "недопуÑÑ‚Ð¸Ð¼Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
@@ -5290,10 +5280,9 @@ msgstr "недопуÑтимый параметр"
msgid "missing argument for option \"%.50s\"\n"
msgstr "не хватает аргумента Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° \"%.50s\"\n"
-#, fuzzy, c-format
-#| msgid "missing argument for option \"%.50s\"\n"
+#, c-format
msgid "invalid argument for option \"%.50s\"\n"
-msgstr "не хватает аргумента Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° \"%.50s\"\n"
+msgstr "недопуÑтимый аргумент Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° \"%.50s\"\n"
#, c-format
msgid "option \"%.50s\" does not expect an argument\n"
commit 77f2964b9602fb463738d14bd957d967a0c1b5ac
Author: Werner Koch <wk at gnupg.org>
Date: Tue Sep 8 15:29:59 2015 +0200
gpg: Print a new FAILURE status after most commands.
* common/status.h (STATUS_FAILURE): New.
* g10/cpr.c (write_status_failure): New.
* g10/gpg.c (main): Call write_status_failure for all commands which
print an error message here.
--
This status line can be used similar to the error code returned by
commands send over the Assuan interface in gpgsm. We don't emit them
in gpgsm because there we already have that Assuan interface to return
proper error code. This change helps GPGME to return better error
codes.
(backported from master 9cdff09743c473a12359bfdb914578ede0e4e3e2)
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/status.h b/common/status.h
index cfb64ca..f101bf0 100644
--- a/common/status.h
+++ b/common/status.h
@@ -20,7 +20,7 @@
#ifndef GNUPG_COMMON_STATUS_H
#define GNUPG_COMMON_STATUS_H
-enum
+enum
{
STATUS_ENTER,
STATUS_LEAVE,
@@ -39,7 +39,7 @@ enum
STATUS_TRUST_MARGINAL,
STATUS_TRUST_FULLY,
STATUS_TRUST_ULTIMATE,
-
+
STATUS_NEED_PASSPHRASE,
STATUS_VALIDSIG,
STATUS_SIG_ID,
@@ -59,20 +59,20 @@ enum
STATUS_ERRMDC,
STATUS_IMPORTED,
STATUS_IMPORT_OK,
- STATUS_IMPORT_PROBLEM,
+ STATUS_IMPORT_PROBLEM,
STATUS_IMPORT_RES,
STATUS_IMPORT_CHECK,
STATUS_FILE_START,
STATUS_FILE_DONE,
STATUS_FILE_ERROR,
-
+
STATUS_BEGIN_DECRYPTION,
STATUS_END_DECRYPTION,
STATUS_BEGIN_ENCRYPTION,
STATUS_END_ENCRYPTION,
STATUS_BEGIN_SIGNING,
-
+
STATUS_DELETE_PROBLEM,
STATUS_GET_BOOL,
@@ -126,6 +126,7 @@ enum
STATUS_TRUNCATED,
STATUS_ERROR,
+ STATUS_FAILURE,
STATUS_SUCCESS
};
diff --git a/g10/cpr.c b/g10/cpr.c
index 0fc45b1..3142ac4 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -303,6 +303,20 @@ write_status_begin_signing (gcry_md_hd_t md)
}
+/* Write a FAILURE status line. */
+void
+write_status_failure (const char *where, gpg_error_t err)
+{
+ if (!statusfp || !status_currently_allowed (STATUS_FAILURE))
+ return; /* Not enabled or allowed. */
+
+ fprintf (statusfp, "[GNUPG:] %s %s %u\n",
+ get_status_string (STATUS_FAILURE), where, err);
+ if (fflush (statusfp) && opt.exit_on_status_write_error)
+ g10_exit (0);
+}
+
+
static int
myread(int fd, void *buf, size_t count)
{
diff --git a/g10/gpg.c b/g10/gpg.c
index 3fb598c..4f71bf4 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3504,15 +3504,21 @@ main (int argc, char **argv)
if( argc > 1 )
wrong_args(_("--store [filename]"));
if( (rc = encode_store(fname)) )
+ {
+ write_status_failure ("store", rc);
log_error ("storing `%s' failed: %s\n",
print_fname_stdin(fname),g10_errstr(rc) );
+ }
break;
case aSym: /* encrypt the given file only with the symmetric cipher */
if( argc > 1 )
wrong_args(_("--symmetric [filename]"));
if( (rc = encode_symmetric(fname)) )
+ {
+ write_status_failure ("symencrypt", rc);
log_error (_("symmetric encryption of `%s' failed: %s\n"),
print_fname_stdin(fname),g10_errstr(rc) );
+ }
break;
case aEncr: /* encrypt the given file */
@@ -3523,8 +3529,11 @@ main (int argc, char **argv)
if( argc > 1 )
wrong_args(_("--encrypt [filename]"));
if( (rc = encode_crypt(fname,remusr,0)) )
- log_error("%s: encryption failed: %s\n",
- print_fname_stdin(fname), g10_errstr(rc) );
+ {
+ write_status_failure ("encrypt", rc);
+ log_error("%s: encryption failed: %s\n",
+ print_fname_stdin(fname), g10_errstr(rc) );
+ }
}
break;
@@ -3544,8 +3553,11 @@ main (int argc, char **argv)
else
{
if( (rc = encode_crypt(fname,remusr,1)) )
- log_error("%s: encryption failed: %s\n",
- print_fname_stdin(fname), g10_errstr(rc) );
+ {
+ write_status_failure ("encrypt", rc);
+ log_error("%s: encryption failed: %s\n",
+ print_fname_stdin(fname), g10_errstr(rc) );
+ }
}
break;
@@ -3564,7 +3576,10 @@ main (int argc, char **argv)
}
}
if( (rc = sign_file( sl, detached_sig, locusr, 0, NULL, NULL)) )
+ {
+ write_status_failure ("sign", rc);
log_error("signing failed: %s\n", g10_errstr(rc) );
+ }
free_strlist(sl);
break;
@@ -3578,8 +3593,11 @@ main (int argc, char **argv)
else
sl = NULL;
if( (rc = sign_file(sl, detached_sig, locusr, 1, remusr, NULL)) )
+ {
+ write_status_failure ("sign-encrypt", rc);
log_error("%s: sign+encrypt failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
+ }
free_strlist(sl);
break;
@@ -3602,8 +3620,11 @@ main (int argc, char **argv)
else
sl = NULL;
if( (rc = sign_file(sl, detached_sig, locusr, 2, remusr, NULL)) )
- log_error("%s: symmetric+sign+encrypt failed: %s\n",
- print_fname_stdin(fname), g10_errstr(rc) );
+ {
+ write_status_failure ("sign-encrypt", rc);
+ log_error("%s: symmetric+sign+encrypt failed: %s\n",
+ print_fname_stdin(fname), g10_errstr(rc) );
+ }
free_strlist(sl);
}
break;
@@ -3613,16 +3634,22 @@ main (int argc, char **argv)
wrong_args(_("--sign --symmetric [filename]"));
rc = sign_symencrypt_file (fname, locusr);
if (rc)
+ {
+ write_status_failure ("sign-symencrypt", rc);
log_error("%s: sign+symmetric failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
+ }
break;
case aClearsign: /* make a clearsig */
if( argc > 1 )
wrong_args(_("--clearsign [filename]"));
if( (rc = clearsign_file(fname, locusr, NULL)) )
+ {
+ write_status_failure ("sign", rc);
log_error("%s: clearsign failed: %s\n",
print_fname_stdin(fname), g10_errstr(rc) );
+ }
break;
case aVerify:
@@ -3636,6 +3663,8 @@ main (int argc, char **argv)
if( (rc = verify_signatures( argc, argv ) ))
log_error("verify signatures failed: %s\n", g10_errstr(rc) );
}
+ if (rc)
+ write_status_failure ("verify", rc);
break;
case aDecrypt:
@@ -3646,7 +3675,10 @@ main (int argc, char **argv)
if( argc > 1 )
wrong_args(_("--decrypt [filename]"));
if( (rc = decrypt_message( fname ) ))
- log_error("decrypt_message failed: %s\n", g10_errstr(rc) );
+ {
+ write_status_failure ("decrypt", rc);
+ log_error("decrypt_message failed: %s\n", g10_errstr(rc));
+ }
}
break;
@@ -3780,11 +3812,20 @@ main (int argc, char **argv)
if(rc)
{
if(cmd==aSendKeys)
- log_error(_("keyserver send failed: %s\n"),g10_errstr(rc));
+ {
+ write_status_failure ("send-keys", rc);
+ log_error(_("keyserver send failed: %s\n"),g10_errstr(rc));
+ }
else if(cmd==aRecvKeys)
- log_error(_("keyserver receive failed: %s\n"),g10_errstr(rc));
+ {
+ write_status_failure ("recv-keys", rc);
+ log_error(_("keyserver receive failed: %s\n"),g10_errstr(rc));
+ }
else
- log_error(_("key export failed: %s\n"),g10_errstr(rc));
+ {
+ write_status_failure ("export", rc);
+ log_error(_("key export failed: %s\n"),g10_errstr(rc));
+ }
}
free_strlist(sl);
break;
@@ -3795,7 +3836,10 @@ main (int argc, char **argv)
append_to_strlist2( &sl, *argv, utf8_strings );
rc=keyserver_search( sl );
if(rc)
- log_error(_("keyserver search failed: %s\n"),g10_errstr(rc));
+ {
+ write_status_failure ("search-keys", rc);
+ log_error(_("keyserver search failed: %s\n"), g10_errstr(rc));
+ }
free_strlist(sl);
break;
@@ -3805,7 +3849,10 @@ main (int argc, char **argv)
append_to_strlist2( &sl, *argv, utf8_strings );
rc=keyserver_refresh(sl);
if(rc)
- log_error(_("keyserver refresh failed: %s\n"),g10_errstr(rc));
+ {
+ write_status_failure ("refresh-keys", rc);
+ log_error(_("keyserver refresh failed: %s\n"),g10_errstr(rc));
+ }
free_strlist(sl);
break;
@@ -3815,7 +3862,10 @@ main (int argc, char **argv)
append_to_strlist2( &sl, *argv, utf8_strings );
rc=keyserver_fetch(sl);
if(rc)
- log_error("key fetch failed: %s\n",g10_errstr(rc));
+ {
+ write_status_failure ("fetch-keys", rc);
+ log_error("key fetch failed: %s\n",g10_errstr(rc));
+ }
free_strlist(sl);
break;
@@ -3856,7 +3906,10 @@ main (int argc, char **argv)
wrong_args("--dearmor [file]");
rc = dearmor_file( argc? *argv: NULL );
if( rc )
+ {
+ write_status_failure ("dearmor", rc);
log_error(_("dearmoring failed: %s\n"), g10_errstr(rc));
+ }
break;
case aEnArmor:
@@ -3864,7 +3917,10 @@ main (int argc, char **argv)
wrong_args("--enarmor [file]");
rc = enarmor_file( argc? *argv: NULL );
if( rc )
+ {
+ write_status_failure ("enarmor", rc);
log_error(_("enarmoring failed: %s\n"), g10_errstr(rc));
+ }
break;
@@ -4053,7 +4109,7 @@ main (int argc, char **argv)
else if (argc == 1)
change_pin (atoi (*argv),1);
else
- wrong_args ("--change-pin [no]");
+ wrong_args ("--change-pin [no]");
break;
#endif /* ENABLE_CARD_SUPPORT*/
@@ -4105,7 +4161,10 @@ main (int argc, char **argv)
}
rc = proc_packets(NULL, a );
if( rc )
+ {
+ write_status_failure ("-", rc);
log_error("processing message failed: %s\n", g10_errstr(rc) );
+ }
iobuf_close(a);
}
break;
diff --git a/g10/main.h b/g10/main.h
index 4ee1b73..86fbabe 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -163,6 +163,7 @@ void set_status_fd ( int fd );
int is_status_enabled ( void );
void write_status ( int no );
void write_status_error (const char *where, int errcode);
+void write_status_failure (const char *where, gpg_error_t err);
void write_status_text ( int no, const char *text );
void write_status_strings (int no, const char *text,
...) GNUPG_GCC_A_SENTINEL(0);
commit 0b01bb7f253fc1f9422e59dc475fa86854b46f69
Author: Werner Koch <wk at gnupg.org>
Date: Fri May 8 16:30:04 2015 +0200
gpg: Avoid cluttering stdout with trustdb info in verbose mode.
* g10/trustdb.c (validate_keys): Call dump_key_array only in debug
mode.
--
I guess that is a left-over from an early attempt to output
information on the trustdb for use by other tools. Maybe related to
the former --list-trust-path command. Sending it to stdout is
probably useful so we do this now only in debug mode.
Signed-off-by: Werner Koch <wk at gnupg.org>
Backported to STABLE-BRANCH-2-0 from
b03a2647299a6c8764a2574590cbaccdff9e497d by dkg
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 11b6a26..9b49b06 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -2445,7 +2445,7 @@ validate_keys (int interactive)
;
/* Store the calculated valididation status somewhere */
- if (opt.verbose > 1)
+ if (opt.verbose > 1 && DBG_TRUST)
dump_key_array (depth, keys);
for (kar=keys; kar->keyblock; kar++)
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 6 ++--
NEWS | 17 ++++++++++-
README | 2 +-
common/status.h | 11 +++----
configure.ac | 2 +-
g10/cpr.c | 14 +++++++++
g10/gpg.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++----------
g10/main.h | 1 +
g10/trustdb.c | 2 +-
po/be.po | 20 ++++++++-----
po/ca.po | 20 ++++++++-----
po/cs.po | 21 ++++++++-----
po/da.po | 21 ++++++++-----
po/de.po | 22 ++++++++------
po/el.po | 20 ++++++++-----
po/eo.po | 20 ++++++++-----
po/es.po | 21 ++++++++-----
po/et.po | 20 ++++++++-----
po/fi.po | 21 ++++++++-----
po/fr.po | 21 ++++++++-----
po/gl.po | 20 ++++++++-----
po/hu.po | 20 ++++++++-----
po/id.po | 20 ++++++++-----
po/it.po | 20 ++++++++-----
po/ja.po | 21 ++++++++-----
po/nb.po | 21 ++++++++-----
po/nl.po | 21 ++++++++-----
po/pl.po | 21 ++++++++-----
po/pt.po | 20 ++++++++-----
po/pt_BR.po | 20 ++++++++-----
po/ro.po | 21 ++++++++-----
po/ru.po | 57 +++++++++++++++--------------------
po/sk.po | 20 ++++++++-----
po/sv.po | 23 +++++++++------
po/tr.po | 21 ++++++++-----
po/uk.po | 23 ++++++++++-----
po/zh_CN.po | 21 ++++++++-----
po/zh_TW.po | 21 ++++++++-----
38 files changed, 496 insertions(+), 289 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list