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

Use ngettext for some strings.

Browse source 
* scd/app-openpgp.c (build_enter_admin_pin_prompt): Use ngettext for
some diagnostics.
(do_genkey): Ditto.
* g10/keyedit.c (check_all_keysigs, menu_delsig, menu_clean): Ditto.
* g10/keylist.c (print_signature_stats): Ditto.
* g10/keyserver.c (keyserver_refresh): Ditto.
* g10/sig-check.c (check_signature_metadata_validity): Ditto.
* g10/sign.c (do_sign): Ditto.
* g10/trustdb.c (reset_trust_records): Ditto.
(validate_keys): Use a table like diagnostic output.
--

Suggested-by: Ineiev <ineiev@gnu.org>
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-01-18 11:20:15 +01:00
parent 56275e4392
commit 437965e562
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
8 changed files with 95 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

34
g10/keylist.c
View file

@ -464,25 +464,23 @@ print_signature_stats (struct keylist_context *s)
if (!s->check_sigs)
return; /* Signature checking was not requested. */
if (s->good_sigs == 1)
log_info (_("1 good signature\n"));
else if (s->good_sigs)
log_info (_("%d good signatures\n"), s->good_sigs);
if (s->good_sigs)
log_info (ngettext("%d good signature\n",
"%d good signatures\n", s->good_sigs), s->good_sigs);
if (s->inv_sigs == 1)
log_info (_("1 bad signature\n"));
else if (s->inv_sigs)
log_info (_("%d bad signatures\n"), s->inv_sigs);
if (s->inv_sigs)
log_info (ngettext("%d bad signature\n",
"%d bad signatures\n", s->inv_sigs), s->inv_sigs);
if (s->no_key == 1)
log_info (_("1 signature not checked due to a missing key\n"));
else if (s->no_key)
log_info (_("%d signatures not checked due to missing keys\n"), s->no_key);
if (s->no_key)
log_info (ngettext("%d signature not checked due to a missing key\n",
"%d signatures not checked due to missing keys\n",
s->no_key), s->no_key);
if (s->oth_err == 1)
log_info (_("1 signature not checked due to an error\n"));
else if (s->oth_err)
log_info (_("%d signatures not checked due to errors\n"), s->oth_err);
if (s->oth_err)
log_info (ngettext("%d signature not checked due to an error\n",
"%d signatures not checked due to errors\n",
s->oth_err), s->oth_err);
}
@ -562,7 +560,9 @@ list_all (ctrl_t ctrl, int secret, int mark_secret)
if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND)
log_error ("keydb_search_next failed: %s\n", gpg_strerror (rc));
if (keydb_get_skipped_counter (hd))
log_info (_("Warning: %lu key(s) skipped due to their large size\n"),
log_info (ngettext("Warning: %lu key skipped due to its large size\n",
"Warning: %lu keys skipped due to their large sizes\n",
keydb_get_skipped_counter (hd)),
keydb_get_skipped_counter (hd));
if (opt.check_sigs && !opt.with_colons)