diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/gpg.c | 6 | ||||
| -rw-r--r-- | g10/gpgcompose.c | 4 | ||||
| -rw-r--r-- | g10/keyserver.c | 2 | ||||
| -rw-r--r-- | g10/parse-packet.c | 4 |
4 files changed, 8 insertions, 8 deletions
@@ -448,10 +448,10 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_c (aPasswd, "passwd", N_("change a passphrase")), ARGPARSE_c (aDesigRevoke, "desig-revoke","@" ), ARGPARSE_c (aExport, "export" , N_("export keys") ), - ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a key server") ), - ARGPARSE_c (aRecvKeys, "recv-keys" , N_("import keys from a key server") ), + ARGPARSE_c (aSendKeys, "send-keys" , N_("export keys to a keyserver") ), + ARGPARSE_c (aRecvKeys, "recv-keys" , N_("import keys from a keyserver") ), ARGPARSE_c (aSearchKeys, "search-keys" , - N_("search for keys on a key server") ), + N_("search for keys on a keyserver") ), ARGPARSE_c (aRefreshKeys, "refresh-keys", N_("update all keys from a keyserver")), ARGPARSE_c (aLocateKeys, "locate-keys", "@"), diff --git a/g10/gpgcompose.c b/g10/gpgcompose.c index 7d8b1b769..cd5346fb0 100644 --- a/g10/gpgcompose.c +++ b/g10/gpgcompose.c @@ -1509,10 +1509,10 @@ static struct option sig_options[] = { "that VALUE is a file to read the data from. " "(RFC 4880, Section 5.2.3.16)" }, { "--key-server-preferences", sig_big_endian_arg, - "Big-endian number encoding the key server preferences. " + "Big-endian number encoding the keyserver preferences. " "(RFC 4880, Section 5.2.3.17)" }, { "--key-server", sig_string_arg, - "The preferred key server. (RFC 4880, Section 5.2.3.18)" }, + "The preferred keyserver. (RFC 4880, Section 5.2.3.18)" }, { "--primary-user-id", sig_flag, "Sets the primary user id flag. (RFC 4880, Section 5.2.3.19)" }, { "--policy-uri", sig_string_arg, diff --git a/g10/keyserver.c b/g10/keyserver.c index 40659f092..d7105de02 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1841,7 +1841,7 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs) /* Loop over all URLs in STRLIST and fetch the key at that URL. Note - that the fetch operation ignores the configured key servers and + that the fetch operation ignores the configured keyservers and instead directly retrieves the keys. */ int keyserver_fetch (ctrl_t ctrl, strlist_t urilist) diff --git a/g10/parse-packet.c b/g10/parse-packet.c index c30abcbe3..e02238bfd 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -1374,12 +1374,12 @@ dump_sig_subpkt (int hashed, int type, int critical, es_fprintf (listfp, " %d", buffer[i]); break; case SIGSUBPKT_KS_FLAGS: - es_fputs ("key server preferences:", listfp); + es_fputs ("keyserver preferences:", listfp); for (i = 0; i < length; i++) es_fprintf (listfp, " %02X", buffer[i]); break; case SIGSUBPKT_PREF_KS: - es_fputs ("preferred key server: ", listfp); + es_fputs ("preferred keyserver: ", listfp); es_write_sanitized (listfp, buffer, length, ")", NULL); break; case SIGSUBPKT_PRIMARY_UID: |