mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
indent: Always use "_(" and not "_ (" to mark translatable strings.
-- This makes greping much easier and we have done that since ever. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
61ef43546b
commit
6cc4702767
11 changed files with 31 additions and 30 deletions
|
@ -361,8 +361,8 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
|
|||
/* Check compliance. */
|
||||
if (! gnupg_cipher_is_allowed (opt.compliance, 0, algo, mode))
|
||||
{
|
||||
log_error (_ ("you may not use cipher algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use cipher algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
gcry_cipher_algo_name (algo),
|
||||
gnupg_compliance_option_string (opt.compliance));
|
||||
rc = gpg_error (GPG_ERR_CIPHER_ALGO);
|
||||
|
|
|
@ -411,8 +411,8 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp)
|
|||
gcry_cipher_map_name (opt.def_cipher_algoid),
|
||||
gcry_cipher_mode_from_oid (opt.def_cipher_algoid)))
|
||||
{
|
||||
log_error (_ ("you may not use cipher algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use cipher algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
opt.def_cipher_algoid,
|
||||
gnupg_compliance_option_string (opt.compliance));
|
||||
rc = gpg_error (GPG_ERR_CIPHER_ALGO);
|
||||
|
|
12
sm/gpgsm.c
12
sm/gpgsm.c
|
@ -1627,8 +1627,8 @@ main ( int argc, char **argv)
|
|||
cmd == aEncr || cmd == aSignEncr,
|
||||
gcry_cipher_mode_from_oid (opt.def_cipher_algoid),
|
||||
GCRY_CIPHER_MODE_NONE))
|
||||
log_error (_ ("you may not use cipher algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use cipher algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
opt.def_cipher_algoid, gnupg_compliance_option_string (opt.compliance));
|
||||
|
||||
if (forced_digest_algo
|
||||
|
@ -1637,8 +1637,8 @@ main ( int argc, char **argv)
|
|||
|| cmd == aSignEncr
|
||||
|| cmd == aClearsign,
|
||||
opt.forced_digest_algo))
|
||||
log_error (_ ("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
forced_digest_algo, gnupg_compliance_option_string (opt.compliance));
|
||||
|
||||
if (extra_digest_algo
|
||||
|
@ -1647,8 +1647,8 @@ main ( int argc, char **argv)
|
|||
|| cmd == aSignEncr
|
||||
|| cmd == aClearsign,
|
||||
opt.extra_digest_algo))
|
||||
log_error (_ ("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
forced_digest_algo, gnupg_compliance_option_string (opt.compliance));
|
||||
|
||||
if (log_get_errorcount(0))
|
||||
|
|
|
@ -464,8 +464,8 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
|
|||
/* Check compliance. */
|
||||
if (! gnupg_digest_is_allowed (opt.compliance, 1, cl->hash_algo))
|
||||
{
|
||||
log_error (_ ("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
gcry_md_algo_name (cl->hash_algo),
|
||||
gnupg_compliance_option_string (opt.compliance));
|
||||
err = gpg_error (GPG_ERR_DIGEST_ALGO);
|
||||
|
|
|
@ -467,8 +467,8 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
|
|||
|
||||
if (! gnupg_digest_is_allowed (opt.compliance, 0, sigval_hash_algo))
|
||||
{
|
||||
log_error (_ ("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
log_error (_("you may not use digest algorithm '%s'"
|
||||
" while in %s mode\n"),
|
||||
gcry_md_algo_name (sigval_hash_algo),
|
||||
gnupg_compliance_option_string (opt.compliance));
|
||||
goto next_signer;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue