security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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@gnupg.org>
This commit is contained in:
Werner Koch 2015-09-16 18:55:27 +02:00
parent 172af881a1
commit f71ed902de
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
g10/keyedit.c
View File

@ -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) ")