Revert "scd: Nitpicks on the improved card prompts"
authorWerner Koch <wk@gnupg.org>
Wed, 22 Feb 2017 17:49:43 +0000 (18:49 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 22 Feb 2017 17:49:43 +0000 (18:49 +0100)
--
This reverts commit 143ca039e1e81140ae520cc1025f8e25c01acc80.

I have a more improved version in the works.

scd/app-openpgp.c

index f68d8bb..90c2661 100644 (file)
@@ -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:"");
     }