diff options
| author | David Shaw <[email protected]> | 2004-10-13 15:34:52 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-13 15:34:52 +0000 |
| commit | 9a4dc13d5e34fd93a2c2b59d99894c75eb3d4fce (patch) | |
| tree | aed46514ac8908373174ae052b2789a188ca6fbb /g10/pkclist.c | |
| parent | * configure.ac: Actually name the option --disable-finger and not (diff) | |
| download | gnupg-9a4dc13d5e34fd93a2c2b59d99894c75eb3d4fce.tar.gz gnupg-9a4dc13d5e34fd93a2c2b59d99894c75eb3d4fce.zip | |
* pkclist.c (do_edit_ownertrust): Different prompt when we're using direct
trust since the meaning is different.
* keyedit.c (trustsig_prompt): Change the strings to match the ones in
pkclist.c:do_edit_ownertrust to make translation easier.
* trustdb.c (trust_model_string, get_validity): Add direct trust model
which applies to the key as a whole and not per-uid.
* options.h, g10.c (parse_trust_model): New. (main): Call it from here to
do string-to-trust-model.
Diffstat (limited to 'g10/pkclist.c')
| -rw-r--r-- | g10/pkclist.c | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/g10/pkclist.c b/g10/pkclist.c index 359a3de2e..b24d24bf2 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -238,31 +238,43 @@ do_edit_ownertrust (PKT_public_key *pk, int mode, tty_printf("\n"); release_kbnode (keyblock); } - /* This string also used in keyedit.c:sign_uids */ - tty_printf (_( - "Please decide how far you trust this user to correctly\n" - "verify other users' keys (by looking at passports,\n" - "checking fingerprints from different sources...)?\n\n")); + + if(opt.trust_model==TM_DIRECT) + { + tty_printf(_("How much do you trust that this key actually " + "belongs to the named user?\n")); + tty_printf("\n"); + } + else + { + /* This string also used in keyedit.c:trustsig_prompt */ + tty_printf(_("Please decide how far you trust this user to" + " correctly verify other users' keys\n" + "(by looking at passports, checking fingerprints from" + " different sources, etc.)\n")); + tty_printf("\n"); + } + if(min_num<=1) - tty_printf (_(" %d = I don't know or won't say\n"), 1); + tty_printf (_(" %d = I don't know or won't say\n"), 1); if(min_num<=2) - tty_printf (_(" %d = I do NOT trust\n"), 2); + tty_printf (_(" %d = I do NOT trust\n"), 2); if(min_num<=3) - tty_printf (_(" %d = I trust marginally\n"), 3); + tty_printf (_(" %d = I trust marginally\n"), 3); if(min_num<=4) - tty_printf (_(" %d = I trust fully\n"), 4); + tty_printf (_(" %d = I trust fully\n"), 4); if (mode) - tty_printf (_(" %d = I trust ultimately\n"), 5); + tty_printf (_(" %d = I trust ultimately\n"), 5); #if 0 /* not yet implemented */ - tty_printf (_(" i = please show me more information\n") ); + tty_printf (" i = please show me more information\n"); #endif if( mode ) - tty_printf(_(" m = back to the main menu\n")); + tty_printf(_(" m = back to the main menu\n")); else { - tty_printf(_(" s = skip this key\n")); - tty_printf(_(" q = quit\n")); + tty_printf(_(" s = skip this key\n")); + tty_printf(_(" q = quit\n")); } tty_printf("\n"); if(minimum) |