From f98c8cb013033c08e98ebedcc0e084fbd2a85b0c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 22 Feb 2017 16:54:32 +0100 Subject: scd,agent: Improve the OpenPGP PIN prompt texts. * scd/app-openpgp.c (get_prompt_info): Change texts. * agent/call-pinentry.c (struct entry_features): New. (getinfo_features_cb): New. (start_pinentry): Set new fucntion as status callback. (build_cmd_setdesc): New. Replace all snprintf for SETDESC by this one. -- Suggested-by: Andre Heinecke Signed-off-by: Werner Koch --- scd/app-openpgp.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'scd') diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 90c26612c..5e75d4bdd 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1986,19 +1986,30 @@ get_prompt_info (app_t app, int chvno, unsigned long sigcount, int remaining) disp_name = get_disp_name (app); if (chvno == 1) { - result = xtryasprintf (_("Card number:\t%s%%0A" - "Signatures:\t%lu%%0A" - "Cardholder:\t%s"), + /* TRANSLATORS: Put a \x1f right before a colon. This can be + * used by pinentry to nicely align the names and values. Keep + * the %s at the start and end of the string. */ + result = xtryasprintf (_("%s" + "Number\x1f: %s%%0A" + "Holder\x1f: %s%%0A" + "Counter\x1f: %lu" + "%s"), + "\x1e", serial, + disp_name? disp_name:"", sigcount, - disp_name? disp_name:""); + ""); } else { - result = xtryasprintf (_("Card number:\t%s%%0A" - "Cardholder:\t%s"), + result = xtryasprintf (_("%s" + "Number\x1f: %s%%0A" + "Holder\x1f: %s" + "%s"), + "\x1e", serial, - disp_name? disp_name:""); + disp_name? disp_name:"", + ""); } xfree (disp_name); xfree (serial); -- cgit v1.2.3