From 1c2f80cf1b8ae3dcf6b30810220ba04fcd1f23ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Wed, 22 Aug 2012 12:53:57 -0400 Subject: [PATCH] Fix typos spotted during translations agent/genkey.c: s/to to/to/ sm/*.c: s/failed to allocated/failed to allocate/ sm/certlist.c: s/should have not/should not have/ Consistency fix: * g10/gpg.c, kbx/kbxutil.c, sm/gpgsm.c: uppercase after Syntax --- agent/genkey.c | 2 +- g10/gpg.c | 4 ++-- kbx/kbxutil.c | 2 +- sm/certchain.c | 6 +++--- sm/certlist.c | 8 ++++---- sm/decrypt.c | 2 +- sm/encrypt.c | 2 +- sm/gpgsm.c | 4 ++-- sm/sign.c | 2 +- sm/verify.c | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/agent/genkey.c b/agent/genkey.c index 176e77d50..d5af9e06d 100644 --- a/agent/genkey.c +++ b/agent/genkey.c @@ -306,7 +306,7 @@ agent_genkey (ctrl_t ctrl, const char *keyparam, size_t keyparamlen, /* Get the passphrase now, cause key generation may take a while. */ { const char *text1 = _("Please enter the passphrase to%0A" - "to protect your new key"); + "protect your new key"); const char *text2 = _("Please re-enter this passphrase"); const char *initial_errtext = NULL; diff --git a/g10/gpg.c b/g10/gpg.c index 7e648fb9d..6e55b4434 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -837,8 +837,8 @@ my_strusage( int level ) break; case 41: p = _("Syntax: gpg [options] [files]\n" - "sign, check, encrypt or decrypt\n" - "default operation depends on the input data\n"); + "Sign, check, encrypt or decrypt\n" + "Default operation depends on the input data\n"); break; case 31: p = "\nHome: "; break; diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index 459281110..f0921b7bf 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -118,7 +118,7 @@ my_strusage( int level ) break; case 41: p = _("Syntax: kbxutil [options] [files]\n" - "list, export, import Keybox data\n"); + "List, export, import Keybox data\n"); break; diff --git a/sm/certchain.c b/sm/certchain.c index f4ad214e8..0023a9845 100644 --- a/sm/certchain.c +++ b/sm/certchain.c @@ -756,7 +756,7 @@ gpgsm_walk_cert_chain (ctrl_t ctrl, ksba_cert_t start, ksba_cert_t *r_next) *r_next = NULL; if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } @@ -1249,7 +1249,7 @@ do_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime_arg, kh = keydb_new (0); if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } @@ -1853,7 +1853,7 @@ gpgsm_basic_cert_check (ctrl_t ctrl, ksba_cert_t cert) kh = keydb_new (0); if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } diff --git a/sm/certlist.c b/sm/certlist.c index 4137437a6..bfacaa259 100644 --- a/sm/certlist.c +++ b/sm/certlist.c @@ -139,7 +139,7 @@ cert_usage_p (ksba_cert_t cert, int mode) { if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN))) return 0; - log_info (_("certificate should have not " + log_info (_("certificate should not have " "been used for certification\n")); 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 |KSBA_KEYUSAGE_CRL_SIGN)))) return 0; - log_info (_("certificate should have not " + log_info (_("certificate should not have " "been used for OCSP response signing\n")); return gpg_error (GPG_ERR_WRONG_KEY_USAGE); } @@ -162,8 +162,8 @@ cert_usage_p (ksba_cert_t cert, int mode) ) return 0; - log_info (mode==3? _("certificate should have not been used for encryption\n"): - mode==2? _("certificate should have not been used for signing\n"): + log_info (mode==3? _("certificate should not have been used for encryption\n"): + mode==2? _("certificate should not have been used for signing\n"): mode==1? _("certificate is not usable for encryption\n"): _("certificate is not usable for signing\n")); return gpg_error (GPG_ERR_WRONG_KEY_USAGE); diff --git a/sm/decrypt.c b/sm/decrypt.c index de025516f..841fbd62b 100644 --- a/sm/decrypt.c +++ b/sm/decrypt.c @@ -258,7 +258,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, FILE *out_fp) kh = keydb_new (0); if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } diff --git a/sm/encrypt.c b/sm/encrypt.c index a526a649e..42a438a95 100644 --- a/sm/encrypt.c +++ b/sm/encrypt.c @@ -332,7 +332,7 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, FILE *out_fp) kh = keydb_new (0); if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 484ce9d31..2470df060 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -523,8 +523,8 @@ my_strusage( int level ) break; case 41: p = _("Syntax: gpgsm [options] [files]\n" - "sign, check, encrypt or decrypt using the S/MIME protocol\n" - "default operation depends on the input data\n"); + "Sign, check, encrypt or decrypt using the S/MIME protocol\n" + "Default operation depends on the input data\n"); break; case 20: diff --git a/sm/sign.c b/sm/sign.c index a9d4990f6..c173740f0 100644 --- a/sm/sign.c +++ b/sm/sign.c @@ -332,7 +332,7 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist, kh = keydb_new (0); if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; } diff --git a/sm/verify.c b/sm/verify.c index 6bc44d2a6..0444dfeea 100644 --- a/sm/verify.c +++ b/sm/verify.c @@ -110,7 +110,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, FILE *out_fp) kh = keydb_new (0); if (!kh) { - log_error (_("failed to allocated keyDB handle\n")); + log_error (_("failed to allocate keyDB handle\n")); rc = gpg_error (GPG_ERR_GENERAL); goto leave; }