[Pkg-gnupg-commit] [gnupg2] 28/241: gpg: Improve text.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Dec 9 20:31:49 UTC 2015


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 445f94bc81b20959a667a4ad80ea6c73059540bf
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 13:42:20 2015 +0200

    gpg: Improve text.
    
    * g10/tofu.c (show_statistics): Improve text.
    
    --
    Signed-off-by: Neal H. Walfield <neal at walfield.org>
    Suggested-by: Malte <malte at wk3.org>
---
 g10/tofu.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index f9aa68f..d34a204 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2005,14 +2005,16 @@ show_statistics (struct db *dbs, const char *fingerprint,
 		 directly internationalize that text so that we can
 		 tweak it without breaking translations.  */
 	      text = _("TOFU: few signatures %s");
-	      if (strcmp (text, "TOFU: few signatures %s") == 0)
+	      if (strcmp (text, "TOFU: few signatures %d %s %s") == 0)
 		text =
-		  "Warning: if this value is unexpectedly low, this might "
-		  "indicate that this key is a forgery!  Carefully examine "
-		  "the email address for small variations (e.g., additional "
-		  "white space).  If the key is suspect, then use '%s' to "
-		  "mark the key as being bad.\n";
-	      log_info (text, set_policy_command);
+		  "Warning: if you think you've seen more than %d %s "
+		  "signed by this key, then this key might be a forgery!  "
+		  "Carefully examine the email address for small variations "
+		  "(e.g., additional white space).  If the key is suspect, "
+		  "then use '%s' to mark it as being bad.\n";
+	      log_info (text,
+			messages, messages == 1 ? _("message") : _("message"),
+			set_policy_command);
 	      free (set_policy_command);
 	    }
 	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list