[svn] GnuPG - r5239 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2009-12-21 16:58:06 +0100 (Mon, 21 Dec 2009)
New Revision: 5239

Modified:
   branches/STABLE-BRANCH-1-4/g10/card-util.c
   branches/STABLE-BRANCH-1-4/g10/ccid-driver.c
   branches/STABLE-BRANCH-1-4/g10/trustdb.c
Log:
Fix some spelling errors.  Fixes bug#1127.


Modified: branches/STABLE-BRANCH-1-4/g10/card-util.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/card-util.c	2009-12-18 16:27:05 UTC (rev 5238)
+++ branches/STABLE-BRANCH-1-4/g10/card-util.c	2009-12-21 15:58:06 UTC (rev 5239)
@@ -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;
     }
 

Modified: branches/STABLE-BRANCH-1-4/g10/ccid-driver.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ccid-driver.c	2009-12-18 16:27:05 UTC (rev 5238)
+++ branches/STABLE-BRANCH-1-4/g10/ccid-driver.c	2009-12-21 15:58:06 UTC (rev 5239)
@@ -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");

Modified: branches/STABLE-BRANCH-1-4/g10/trustdb.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/trustdb.c	2009-12-18 16:27:05 UTC (rev 5238)
+++ branches/STABLE-BRANCH-1-4/g10/trustdb.c	2009-12-21 15:58:06 UTC (rev 5239)
@@ -1657,7 +1657,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)
@@ -1665,7 +1665,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++;