[Pkg-gnupg-commit] [gnupg2] 125/166: 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 143ca039e1e81140ae520cc1025f8e25c01acc80
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 22 16:57:58 2017 +0100

    scd: Nitpicks on the improved card prompts
    
    * src/app-openpgp.c (get_prompt_info): Change wording and order
    slightly.
    
    --
    
    The word "Card" was repeated too much in the prompt and moving
    signatures to the bottom results in a more consistent layout
    between the prompts with signcount and the prompts without.
    
    Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
---
 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 90c2661..f68d8bb 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 (_("Card number:\t%s%%0A"
-                               "Signatures:\t%lu%%0A"
-                               "Cardholder:\t%s"),
+      result = xtryasprintf (_("Number:\t%s%%0A"
+                               "Holder:\t%s%%0A"
+                               "Signatures:\t%lu"),
                              serial,
-                             sigcount,
-                             disp_name? disp_name:"");
+                             disp_name? disp_name:"",
+                             sigcount);
     }
   else
     {
-      result = xtryasprintf (_("Card number:\t%s%%0A"
-                               "Cardholder:\t%s"),
+      result = xtryasprintf (_("Number:\t%s%%0A"
+                               "Holder:\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