[git] GnuPG - branch, master, updated. gnupg-2.1.18-126-g468dbc7

by Andre Heinecke cvs at cvs.gnupg.org
Wed Feb 22 17:12:19 CET 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  468dbc74d2a07a095911f334213bb82d97fc1ff6 (commit)
       via  143ca039e1e81140ae520cc1025f8e25c01acc80 (commit)
      from  aa61cb5bbaba6797cf0d6d89ba39fe0c9b393724 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 468dbc74d2a07a095911f334213bb82d97fc1ff6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 22 17:07:16 2017 +0100

    po: Update the German translation
    
    --

diff --git a/po/de.po b/po/de.po
index ea875d4..c72fe49 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6221,12 +6221,12 @@ msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
 #, c-format
-msgid "Card number:\t%s%%0ASignatures:\t%lu%%0ACardholder:\t%s"
-msgstr "Kartennummer:\t%s%%0ASignaturen:\t%lu%%0AKartenbesitzer:\t%s"
+msgid "Number:\t%s%%0AHolder:\t%s%%0ASignatures:\t%lu"
+msgstr "Nummer:\t%s%%0ABesitzer:\t%s%%0ASignaturen:\t%lu"
 
 #, c-format
-msgid "Card number:\t%s%%0ACardholder:\t%s"
-msgstr "Kartennummer:\t%s%%0AKartenbesitzer:\t%s"
+msgid "Number:\t%s%%0AHolder:\t%s"
+msgstr "Nummer:\t%s%%0ABesitzer:\t%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.

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>

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:"");
     }

-----------------------------------------------------------------------

Summary of changes:
 po/de.po          |  8 ++++----
 scd/app-openpgp.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list