security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Fix typos spotted during translations 

* agent/genkey.c: s/to to/to/
* sm/*.c: s/failed to allocated/failed to allocate/
* sm/certlist.c, ./dirmngr/validate.c: s/should have not/should not have/
* g10/seskey.c: missing closing parenthesis
* dirmngr/crlcache.c: s/may has/may have/

Consistency fix:

* g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax
* dirmngr/dirmngr_ldap: no period in Syntax
* dirmngr/dirmngr-client.c: infinitive for option description:
	s/certificates are expected/expect certificates/
This commit is contained in:
David Prévot 2012-08-22 12:54:38 -04:00 committed by Werner Koch
parent 94e663885b
commit ba591e2f14
15 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/genkey.c
View File

@ -404,7 +404,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce,
else else
rc = agent_ask_new_passphrase (ctrl, rc = agent_ask_new_passphrase (ctrl,
_("Please enter the passphrase to%0A" _("Please enter the passphrase to%0A"
"to protect your new key"), "protect your new key"),
&passphrase); &passphrase);
if (rc) if (rc)
return rc; return rc;

2
dirmngr/crlcache.c
View File

@ -2301,7 +2301,7 @@ list_one_crl_entry (crl_cache_t cache, crl_cache_entry_t e, estream_t fp)
return gpg_error (GPG_ERR_GENERAL); return gpg_error (GPG_ERR_GENERAL);
if (!e->dbfile_checked) if (!e->dbfile_checked)
es_fprintf (fp, _(" ERROR: This cached CRL may has been tampered with!\n")); es_fprintf (fp, _(" ERROR: This cached CRL may have been tampered with!\n"));
es_putc ('\n', fp); es_putc ('\n', fp);

2
dirmngr/dirmngr-client.c
View File

@ -76,7 +76,7 @@ static ARGPARSE_OPTS opts[] = {
{ oUrl, "url", 0, N_("expect an URL for --lookup")}, { oUrl, "url", 0, N_("expect an URL for --lookup")},
{ oLoadCRL, "load-crl", 0, N_("load a CRL into the dirmngr")}, { oLoadCRL, "load-crl", 0, N_("load a CRL into the dirmngr")},
{ oSquidMode,"squid-mode",0, N_("special mode for use by Squid")}, { oSquidMode,"squid-mode",0, N_("special mode for use by Squid")},
{ oPEM, "pem", 0, N_("certificates are expected in PEM format")}, { oPEM, "pem", 0, N_("expect certificates in PEM format")},
{ oForceDefaultResponder, "force-default-responder", 0, { oForceDefaultResponder, "force-default-responder", 0,
N_("force the use of the default OCSP responder")}, N_("force the use of the default OCSP responder")},
{ 0, NULL, 0, NULL } { 0, NULL, 0, NULL }

4
dirmngr/dirmngr_ldap.c
View File

@ -203,8 +203,8 @@ my_strusage (int level)
break; break;
case 41: p = case 41: p =
_("Syntax: dirmngr_ldap [options] [URL]\n" _("Syntax: dirmngr_ldap [options] [URL]\n"
"Internal LDAP helper for Dirmngr.\n" "Internal LDAP helper for Dirmngr\n"
"Interface and options may change without notice.\n"); "Interface and options may change without notice\n");
break; break;
default: p = NULL; default: p = NULL;

10
dirmngr/validate.c
View File

@ -1096,7 +1096,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
{ {
if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN))) if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN)))
return 0; return 0;
log_info (_("certificate should have not " log_info (_("certificate should not have "
"been used for certification\n")); "been used for certification\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
} }
@ -1108,7 +1108,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
|| (use & (KSBA_KEYUSAGE_KEY_CERT_SIGN || (use & (KSBA_KEYUSAGE_KEY_CERT_SIGN
|KSBA_KEYUSAGE_CRL_SIGN)))) |KSBA_KEYUSAGE_CRL_SIGN))))
return 0; return 0;
log_info (_("certificate should have not " log_info (_("certificate should not have "
"been used for OCSP response signing\n")); "been used for OCSP response signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
} }
@ -1117,7 +1117,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
{ {
if ((use & (KSBA_KEYUSAGE_CRL_SIGN))) if ((use & (KSBA_KEYUSAGE_CRL_SIGN)))
return 0; return 0;
log_info (_("certificate should have not " log_info (_("certificate should not have "
"been used for CRL signing\n")); "been used for CRL signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
} }
@ -1128,9 +1128,9 @@ cert_usage_p (ksba_cert_t cert, int mode)
) )
return 0; return 0;
log_info (mode==3? _("certificate should have not been used " log_info (mode==3? _("certificate should not have been used "
"for encryption\n"): "for encryption\n"):
mode==2? _("certificate should have not been used for signing\n"): mode==2? _("certificate should not have been used for signing\n"):
mode==1? _("certificate is not usable for encryption\n"): mode==1? _("certificate is not usable for encryption\n"):
_("certificate is not usable for signing\n")); _("certificate is not usable for signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);

4
g10/gpg.c
View File

@ -845,8 +845,8 @@ my_strusage( int level )
break; break;
case 41: p = case 41: p =
_("Syntax: gpg [options] [files]\n" _("Syntax: gpg [options] [files]\n"
"sign, check, encrypt or decrypt\n" "Sign, check, encrypt or decrypt\n"
"default operation depends on the input data\n"); "Default operation depends on the input data\n");
break; break;
case 31: p = "\nHome: "; break; case 31: p = "\nHome: "; break;

2
g10/seskey.c
View File

@ -310,7 +310,7 @@ encode_md_value (PKT_public_key *pk, gcry_md_hd_t md, int hash_algo)
if (mdlen < qbits/8) if (mdlen < qbits/8)
{ {
log_error (_("%s key %s requires a %zu bit or larger hash " log_error (_("%s key %s requires a %zu bit or larger hash "
"(hash is %s\n"), "(hash is %s)\n"),
gcry_pk_algo_name (pkalgo), gcry_pk_algo_name (pkalgo),
keystr_from_pk(pk), qbits, keystr_from_pk(pk), qbits,
gcry_md_algo_name (hash_algo)); gcry_md_algo_name (hash_algo));

2
kbx/kbxutil.c
View File

@ -118,7 +118,7 @@ my_strusage( int level )
break; break;
case 41: p = case 41: p =
_("Syntax: kbxutil [options] [files]\n" _("Syntax: kbxutil [options] [files]\n"
"list, export, import Keybox data\n"); "List, export, import Keybox data\n");
break; break;

6
sm/certchain.c
View File

@ -756,7 +756,7 @@ gpgsm_walk_cert_chain (ctrl_t ctrl, ksba_cert_t start, ksba_cert_t *r_next)
*r_next = NULL; *r_next = NULL;
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }
@ -1250,7 +1250,7 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg,
kh = keydb_new (0); kh = keydb_new (0);
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }
@ -1890,7 +1890,7 @@ gpgsm_basic_cert_check (ctrl_t ctrl, ksba_cert_t cert)
kh = keydb_new (0); kh = keydb_new (0);
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }

8
sm/certlist.c
View File

@ -139,7 +139,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
{ {
if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN))) if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN)))
return 0; return 0;
log_info (_("certificate should have not " log_info (_("certificate should not have "
"been used for certification\n")); "been used for certification\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
} }
@ -151,7 +151,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
|| (use & (KSBA_KEYUSAGE_KEY_CERT_SIGN || (use & (KSBA_KEYUSAGE_KEY_CERT_SIGN
|KSBA_KEYUSAGE_CRL_SIGN)))) |KSBA_KEYUSAGE_CRL_SIGN))))
return 0; return 0;
log_info (_("certificate should have not " log_info (_("certificate should not have "
"been used for OCSP response signing\n")); "been used for OCSP response signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
} }
@ -162,8 +162,8 @@ cert_usage_p (ksba_cert_t cert, int mode)
) )
return 0; return 0;
log_info (mode==3? _("certificate should have not been used for encryption\n"): log_info (mode==3? _("certificate should not have been used for encryption\n"):
mode==2? _("certificate should have not been used for signing\n"): mode==2? _("certificate should not have been used for signing\n"):
mode==1? _("certificate is not usable for encryption\n"): mode==1? _("certificate is not usable for encryption\n"):
_("certificate is not usable for signing\n")); _("certificate is not usable for signing\n"));
return gpg_error (GPG_ERR_WRONG_KEY_USAGE); return gpg_error (GPG_ERR_WRONG_KEY_USAGE);

2
sm/decrypt.c
View File

@ -259,7 +259,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t out_fp)
kh = keydb_new (0); kh = keydb_new (0);
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }

2
sm/encrypt.c
View File

@ -336,7 +336,7 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t out_fp)
kh = keydb_new (0); kh = keydb_new (0);
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }

4
sm/gpgsm.c
View File

@ -535,8 +535,8 @@ my_strusage( int level )
break; break;
case 41: case 41:
p = _("Syntax: gpgsm [options] [files]\n" p = _("Syntax: gpgsm [options] [files]\n"
"sign, check, encrypt or decrypt using the S/MIME protocol\n" "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
"default operation depends on the input data\n"); "Default operation depends on the input data\n");
break; break;
case 20: case 20:

2
sm/sign.c
View File

@ -334,7 +334,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
kh = keydb_new (0); kh = keydb_new (0);
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }

2
sm/verify.c
View File

@ -111,7 +111,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
kh = keydb_new (0); kh = keydb_new (0);
if (!kh) if (!kh)
{ {
log_error (_("failed to allocated keyDB handle\n")); log_error (_("failed to allocate keyDB handle\n"));
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }