[Pkg-gnupg-commit] [gnupg2] 127/166: Revert "scd: Nitpicks on the improved card prompts"

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 7ccabbc26a2fd0d18fef4f4f15731377b514c97d
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Feb 22 18:49:43 2017 +0100

    Revert "scd: Nitpicks on the improved card prompts"
    
    --
    This reverts commit 143ca039e1e81140ae520cc1025f8e25c01acc80.
    
    I have a more improved version in the works.
---
 scd/app-openpgp.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index f68d8bb..90c2661 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -1986,17 +1986,17 @@ get_prompt_info (app_t app, int chvno, unsigned long sigcount, int remaining)
   disp_name = get_disp_name (app);
   if (chvno == 1)
     {
-      result = xtryasprintf (_("Number:\t%s%%0A"
-                               "Holder:\t%s%%0A"
-                               "Signatures:\t%lu"),
+      result = xtryasprintf (_("Card number:\t%s%%0A"
+                               "Signatures:\t%lu%%0A"
+                               "Cardholder:\t%s"),
                              serial,
-                             disp_name? disp_name:"",
-                             sigcount);
+                             sigcount,
+                             disp_name? disp_name:"");
     }
   else
     {
-      result = xtryasprintf (_("Number:\t%s%%0A"
-                               "Holder:\t%s"),
+      result = xtryasprintf (_("Card number:\t%s%%0A"
+                               "Cardholder:\t%s"),
                              serial,
                              disp_name? disp_name:"");
     }

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