[git] GnuPG - branch, master, updated. gnupg-2.1.8-28-gf71ed90

[by Werner Koch]

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  f71ed902def81f9408d9094289d8a97abaa0f609 (commit)
      from  172af881a1cfe82dfec1c43102d6c464e67ef230 (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 f71ed902def81f9408d9094289d8a97abaa0f609
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Sep 16 18:55:27 2015 +0200

    gpg: Change last commit to avoid extra translations.
    
    * g10/keyedit.c (keyedit_menu): Do not print usage hints in expert
    mode.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 6fd8e86..61aceb2 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1769,7 +1769,11 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	    int n1;
 
 	    if (!(n1 = count_selected_uids (keyblock)))
-	      tty_printf (_("You must select at least one user ID (use the 'uid' command).\n"));
+              {
+                tty_printf (_("You must select at least one user ID.\n"));
+                if (!opt.expert)
+                  tty_printf (_("(Use the '%s' command.)\n"), "uid");
+              }
 	    else if (real_uids_left (keyblock) < 1)
 	      tty_printf (_("You can't delete the last user ID!\n"));
 	    else if (cpr_get_answer_is_yes
@@ -1789,7 +1793,11 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	    int n1;
 
 	    if (!(n1 = count_selected_uids (keyblock)))
-	      tty_printf (_("You must select at least one user ID (use the 'uid' command).\n"));
+              {
+                tty_printf (_("You must select at least one user ID.\n"));
+                if (!opt.expert)
+                  tty_printf (_("(Use the '%s' command.)\n"), "uid");
+              }
 	    else if (menu_delsig (keyblock))
 	      {
 		/* No redisplay here, because it may scroll away some
@@ -1949,7 +1957,11 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	    int n1;
 
 	    if (!(n1 = count_selected_keys (keyblock)))
-	      tty_printf (_("You must select at least one key (use the 'key' command).\n"));
+              {
+                tty_printf (_("You must select at least one key.\n"));
+                if (!opt.expert)
+                  tty_printf (_("(Use the '%s' command.)\n"), "key");
+              }
 	    else if (!cpr_get_answer_is_yes
                      ("keyedit.remove.subkey.okay",
                       n1 > 1 ? _("Do you really want to delete the "
@@ -1985,7 +1997,11 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	    int n1;
 
 	    if (!(n1 = count_selected_uids (keyblock)))
-	      tty_printf (_("You must select at least one user ID (use the 'uid' command).\n"));
+              {
+                tty_printf (_("You must select at least one user ID.\n"));
+                if (!opt.expert)
+                  tty_printf (_("(Use the '%s' command.)\n"), "uid");
+              }
 	    else if (cpr_get_answer_is_yes
                      ("keyedit.revoke.uid.okay",
                       n1 > 1 ? _("Really revoke all selected user IDs? (y/N) ")

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

Summary of changes:
 g10/keyedit.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)


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