[PATCH 3/3] Fix typos spotted during translations

David Prévot taffit at debian.org
Wed Aug 22 18:54:38 CEST 2012


* 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/
---
 agent/genkey.c           |    2 +-
 dirmngr/crlcache.c       |    2 +-
 dirmngr/dirmngr-client.c |    2 +-
 dirmngr/dirmngr_ldap.c   |    4 ++--
 dirmngr/validate.c       |   10 +++++-----
 g10/gpg.c                |    4 ++--
 g10/seskey.c             |    2 +-
 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 +-
 15 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/agent/genkey.c b/agent/genkey.c
index 20b9230..c040f13 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -404,7 +404,7 @@ agent_genkey (ctrl_t ctrl, const char *cache_nonce,
   else
     rc = agent_ask_new_passphrase (ctrl,
                                    _("Please enter the passphrase to%0A"
-                                     "to protect your new key"),
+                                     "protect your new key"),
                                    &passphrase);
   if (rc)
     return rc;
diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index a4d8e80..8505f9c 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -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);
 
   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);
 
diff --git a/dirmngr/dirmngr-client.c b/dirmngr/dirmngr-client.c
index 65d5a84..21f7743 100644
--- a/dirmngr/dirmngr-client.c
+++ b/dirmngr/dirmngr-client.c
@@ -76,7 +76,7 @@ static ARGPARSE_OPTS opts[] = {
   { oUrl,      "url",       0, N_("expect an URL for --lookup")},
   { oLoadCRL,  "load-crl",  0, N_("load a CRL into the dirmngr")},
   { 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,
     N_("force the use of the default OCSP responder")},
   { 0, NULL, 0, NULL }
diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c
index e17d262..1b513ea 100644
--- a/dirmngr/dirmngr_ldap.c
+++ b/dirmngr/dirmngr_ldap.c
@@ -203,8 +203,8 @@ my_strusage (int level)
       break;
     case 41: p =
           _("Syntax: dirmngr_ldap [options] [URL]\n"
-            "Internal LDAP helper for Dirmngr.\n"
-            "Interface and options may change without notice.\n");
+            "Internal LDAP helper for Dirmngr\n"
+            "Interface and options may change without notice\n");
       break;
 
     default: p = NULL;
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 3ef676a..024708b 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -1096,7 +1096,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);
     }
@@ -1108,7 +1108,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);
     }
@@ -1117,7 +1117,7 @@ cert_usage_p (ksba_cert_t cert, int mode)
     {
       if ((use & (KSBA_KEYUSAGE_CRL_SIGN)))
         return 0;
-      log_info (_("certificate should have not "
+      log_info (_("certificate should not have "
                   "been used for CRL signing\n"));
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
@@ -1128,9 +1128,9 @@ cert_usage_p (ksba_cert_t cert, int mode)
       )
     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"):
-            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"):
                      _("certificate is not usable for signing\n"));
   return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
diff --git a/g10/gpg.c b/g10/gpg.c
index c8dbbfe..b614a94 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -845,8 +845,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/g10/seskey.c b/g10/seskey.c
index 93a809d..ac6e6d6 100644
--- a/g10/seskey.c
+++ b/g10/seskey.c
@@ -310,7 +310,7 @@ encode_md_value (PKT_public_key *pk, gcry_md_hd_t md, int hash_algo)
       if (mdlen < qbits/8)
 	{
 	  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),
                      keystr_from_pk(pk), qbits,
                      gcry_md_algo_name (hash_algo));
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c
index c9d5681..62e3dbe 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 18744b1..b51291d 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;
     }
@@ -1250,7 +1250,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;
     }
@@ -1890,7 +1890,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 241364a..9adcabf 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 6161150..a560272 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -259,7 +259,7 @@ gpgsm_decrypt (ctrl_t ctrl, int in_fd, estream_t 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 e881333..54a8bd1 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -336,7 +336,7 @@ gpgsm_encrypt (ctrl_t ctrl, certlist_t recplist, int data_fd, estream_t 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 7263fd0..b001682 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -535,8 +535,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 e102cd0..08eebb7 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -334,7 +334,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 8cf7ff9..2e91137 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -111,7 +111,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t 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;
     }
-- 
1.7.10.4




More information about the Gnupg-devel mailing list