Index: gnupg_2/agent/divert-scd.c =================================================================== --- gnupg_2/agent/divert-scd.c +++ gnupg_2/agent/divert-scd.c @@ -80,7 +80,7 @@ } else { - log_error ("error accesing card: %s\n", gpg_strerror (rc)); + log_error ("error accessing card: %s\n", gpg_strerror (rc)); } if (!rc) Index: gnupg_2/agent/minip12.c =================================================================== --- gnupg_2/agent/minip12.c +++ gnupg_2/agent/minip12.c @@ -1698,7 +1698,7 @@ } if (i != 8) { - log_error ("invalid paramters for p12_build\n"); + log_error ("invalid parameters for p12_build\n"); return NULL; } /* Now this all goes into a sequence. */ Index: gnupg_2/common/estream.c =================================================================== --- gnupg_2/common/estream.c +++ gnupg_2/common/estream.c @@ -1423,7 +1423,7 @@ } /* Try to unread DATA_N bytes from DATA into STREAM, storing the - amount of bytes succesfully unread in *BYTES_UNREAD. */ + amount of bytes successfully unread in *BYTES_UNREAD. */ static void es_unreadn (estream_t ES__RESTRICT stream, const unsigned char *ES__RESTRICT data, size_t data_n, Index: gnupg_2/g10/card-util.c =================================================================== --- gnupg_2/g10/card-util.c +++ gnupg_2/g10/card-util.c @@ -948,7 +948,7 @@ } else { - tty_printf ("usage error: redirectrion to file required\n"); + tty_printf ("usage error: redirection to file required\n"); return -1; } @@ -977,7 +977,7 @@ } else { - tty_printf ("usage error: redirectrion to file required\n"); + tty_printf ("usage error: redirection to file required\n"); return -1; } Index: gnupg_2/g10/trustdb.c =================================================================== --- gnupg_2/g10/trustdb.c +++ gnupg_2/g10/trustdb.c @@ -1655,7 +1655,7 @@ /* Everything else we delete */ /* At this point, if 12 is set, the signing key was unavailable. - If 9 or 10 is set, it's superceded. Otherwise, it's + If 9 or 10 is set, it's superseded. Otherwise, it's invalid. */ if(noisy) @@ -1663,7 +1663,7 @@ keystr(node->pkt->pkt.signature->keyid), uidnode->pkt->pkt.user_id->name, node->flag&(1<<12)?"key unavailable": - node->flag&(1<<9)?"signature superceded":"invalid signature"); + node->flag&(1<<9)?"signature superseded":"invalid signature"); delete_kbnode(node); deleted++; Index: gnupg_2/scd/app-p15.c =================================================================== --- gnupg_2/scd/app-p15.c +++ gnupg_2/scd/app-p15.c @@ -2909,7 +2909,7 @@ if (aodf->pinflags.integrity_protected || aodf->pinflags.confidentiality_protected) { - log_error ("PIN verification requires unsupported protecion method\n"); + log_error ("PIN verification requires unsupported protection method\n"); return gpg_error (GPG_ERR_BAD_PIN_METHOD); } if (!aodf->stored_length && aodf->pinflags.needs_padding) Index: gnupg_2/scd/ccid-driver.c =================================================================== --- gnupg_2/scd/ccid-driver.c +++ gnupg_2/scd/ccid-driver.c @@ -845,11 +845,11 @@ if ((us & 0x0020)) DEBUGOUT (" Auto baud rate change\n"); if ((us & 0x0040)) - DEBUGOUT (" Auto parameter negotation made by CCID\n"); + DEBUGOUT (" Auto parameter negotiation made by CCID\n"); else if ((us & 0x0080)) DEBUGOUT (" Auto PPS made by CCID\n"); else if ((us & (0x0040 | 0x0080))) - DEBUGOUT (" WARNING: conflicting negotation features\n"); + DEBUGOUT (" WARNING: conflicting negotiation features\n"); if ((us & 0x0100)) DEBUGOUT (" CCID can set ICC in clock stop mode\n");