diff options
| author | David Shaw <[email protected]> | 2004-10-11 21:08:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-10-11 21:08:37 +0000 |
| commit | bf079613b7082a6aa95e067c535a9e74ecad490b (patch) | |
| tree | 910211f2f4112d1a4589f5e1fb972954e7583790 /g10/mainproc.c | |
| parent | * gpgkeys_finger.c, gpgkeys_hkp.c, gpgkeys_http.c, gpgkeys_ldap.c: Fix a (diff) | |
| download | gnupg-bf079613b7082a6aa95e067c535a9e74ecad490b.tar.gz gnupg-bf079613b7082a6aa95e067c535a9e74ecad490b.zip | |
* pkclist.c (do_edit_ownertrust): Use the same translated string for
showing the user ID as mainproc.c:print_pkenc_list.
* mainproc.c (print_pkenc_list): Allow translating the quotes around the
user ID.
* card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s'
quoting for things that aren't user IDs.
* keyserver.c (keyserver_spawn): If there is no keyserver host, print the
whole URI since it is self-contained.
Diffstat (limited to 'g10/mainproc.c')
| -rw-r--r-- | g10/mainproc.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index a1daa9c04..138a85542 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -457,16 +457,13 @@ print_pkenc_list( struct kidlist_item *list, int failed ) pk->pubkey_algo = list->pubkey_algo; if( !get_pubkey( pk, list->kid ) ) { - size_t n; char *p; log_info( _("encrypted with %u-bit %s key, ID %s, created %s\n"), nbits_from_pk( pk ), algstr, keystr_from_pk(pk), strtimestamp(pk->timestamp) ); - fputs(" \"", log_stream() ); - p = get_user_id( list->kid, &n ); - print_utf8_string2 ( log_stream(), p, n, '"' ); + p=get_user_id_native(list->kid); + fprintf(log_stream(),_(" \"%s\"\n"),p); m_free(p); - fputs("\"\n", log_stream() ); } else log_info(_("encrypted with %s key, ID %s\n"), @@ -579,7 +576,7 @@ proc_encrypted( CTX c, PACKET *pkt ) sprintf ( buf, "%d:", c->dek->algo ); for(i=0; i < c->dek->keylen; i++ ) sprintf(buf+strlen(buf), "%02X", c->dek->key[i] ); - log_info( "session key: \"%s\"\n", buf ); + log_info( "session key: `%s'\n", buf ); write_status_text ( STATUS_SESSION_KEY, buf ); } } |