diff options
| author | Werner Koch <[email protected]> | 2015-09-16 16:55:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-09-16 16:55:27 +0000 |
| commit | f71ed902def81f9408d9094289d8a97abaa0f609 (patch) | |
| tree | 242531c6f4e33f869f311ad1577587a0af6abba8 | |
| parent | g10: Improve error message. (diff) | |
| download | gnupg-f71ed902def81f9408d9094289d8a97abaa0f609.tar.gz gnupg-f71ed902def81f9408d9094289d8a97abaa0f609.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | g10/keyedit.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 6fd8e86cd..61aceb24b 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) ") |