security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

gpg: Change some error messages.

Browse source 
* g10/getkey.c (parse_def_secret_key): Change error message.  Replace
log_debug by log_info.
* g10/gpg.c (check_user_ids): Make function static.  Change error
messages.
(main): Change error messages.
* g10/revoke.c (gen_revoke): Ditto.
--

There are other smaller changes not described above.

This change tries to avoid new error messages so not to increase the
the number of translated strings or break too many existing
translations.  It also tries to use existing strings and changes the
quoting to the most common style used in gpg.

Key specifications should in general use double quotes.  Other values
should use single quotes.  However. sometimes it is not easy to
distinguish between values given on the command line and key
specifications.  According to old GNU coding standards diagnostics
should not start capitalized - whether this is a good idea is a
different thing but we used this rules for most strings.  However,
strings which are used interactively should be properly capitalized
and end with a dot.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-12-03 10:39:29 +01:00
parent f42c50dbf0
commit 9fcc047d92
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
6 changed files with 53 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
g10/revoke.c
View file

@ -615,10 +615,9 @@ gen_revoke (const char *uname)
if (rc)
{
if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
log_error (_("no secret key matches the search term \"%s\"\n"),
uname);
log_error (_("secret key \"%s\" not found\n"), uname);
else
log_error (_("error looking up secret key \"%s\": %s\n"),
log_error (_("secret key \"%s\" not found: %s\n"),
uname, gpg_strerror (rc));
goto leave;
}
@ -640,6 +639,9 @@ gen_revoke (const char *uname)
{
char *info;
/* TRANSLATORS: The %s prints a key specification which
for example has been given at the command line. Several lines
lines with secret key infos are printed after this message. */
log_error (_("'%s' matches multiple secret keys:\n"), uname);
info = format_seckey_info (keyblock->pkt->pkt.public_key);
@ -651,7 +653,7 @@ gen_revoke (const char *uname)
while (! rc)
{
info = format_seckey_info (keyblock->pkt->pkt.public_key);
log_error (" %s\n", info);
log_info (" %s\n", info);
xfree (info);
release_kbnode (keyblock);
keyblock = NULL;