Merge remote-tracking branch 'origin/bug-1213' into release

6 files changed, 14 insertions, 14 deletions

diff --git a/pages/account/10.php b/pages/account/10.php
index 6371f76..8908400 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -17,7 +17,7 @@
 */
 	include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certficate Acceptable Use Policy")?></h3>
+<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
 <p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
 <p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
@@ -35,7 +35,7 @@
 <input type="radio" name="rootcert" value="2" checked/> <?=_("Sign by class 3 root certificate")?><br />
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <? } ?>
-<p><?=_("Optional comment, only used in the certifictate overview")?><br>
+<p><?=_("Optional comment, only used in the certificate overview")?><br>
        <input type="text" name="description" maxlength="80" size=80/></p>
 <p><?=_("Paste your CSR(Certificate Signing Request) below...")?></p>
 <textarea name="CSR" cols="80" rows="15"></textarea><br />
diff --git a/pages/account/16.php b/pages/account/16.php
index 6f055d7..564463e 100644
--- a/pages/account/16.php
+++ b/pages/account/16.php
@@ -58,7 +58,7 @@
 <? } ?>
    <tr>
    <td class="DataTD" colspan="2" align="left">
-      <?=_("Optional comment, only used in the certifictate overview")?><br />
+      <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 />
    </td>
   </tr>
diff --git a/pages/account/20.php b/pages/account/20.php
index 0187013..ee16dd4 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -17,7 +17,7 @@
 */
 	include_once("../includes/shutdown.php");
 ?>
-<h3><?=_("CAcert Certficate Acceptable Use Policy")?></h3>
+<h3><?=_("CAcert Certificate Acceptable Use Policy")?></h3>
 <p><?=_("Once you decide to subscribe for an SSL Server Certificate you will need to complete this agreement. Please read it carefully. Your Certificate Request can only be processed with your acceptance and understanding of this agreement.")?></p>
 
 <p><?=_("I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.")?></p>
@@ -29,7 +29,7 @@
 <form method="post" action="account.php">
 <input type="radio" name="rootcert" value="1" /> <?=_("Sign by class 1 root certificate")?><br />
 <input type="radio" name="rootcert" value="2" checked /> <?=_("Sign by class 3 root certificate")?><br />
-<p> <?=_("Optional comment, only used in the certifictate overview")?><br />
+<p> <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 /></p>
 <p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
 <p><?=_("Paste your CSR below...")?></p>
diff --git a/pages/account/3.php b/pages/account/3.php
index b760c11..7e34300 100644
--- a/pages/account/3.php
+++ b/pages/account/3.php
@@ -24,7 +24,7 @@
 
 <p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
 
-<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed andwill not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
+<p><?=_("If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.")?></p>
 
 <form method="post" action="account.php">
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
@@ -90,7 +90,7 @@ if($_SESSION['profile']['points'] >= 50)
   </tr>
   <tr>
    <td class="DataTD" colspan="2" align="left">
-      <?=_("Optional comment, only used in the certifictate overview max. 100 characters")?><br />
+      <?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="100" size="100" />
    </td>
   </tr>
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index f490511..a11c4bf 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,7 +19,7 @@
 ?>
 <p><?=_("Paste your own public OpenPGP key below. It should not contain a picture. CAcert will sign your key after submission.")?></p>
 <form method="post" action="gpg.php">
-<p><?=_("Optional comment, only used in the certifictate overview")?><br />
+<p><?=_("Optional comment, only used in the certificate overview")?><br />
        <input type="text" name="description" maxlength="80" size=80 /></p>
 <textarea name="CSR" cols="80" rows="15"><?=array_key_exists('CSR',$_POST)?strip_tags($_POST['CSR']):""?></textarea><br />
 <p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
diff --git a/scripts/mail-weak-keys.php b/scripts/mail-weak-keys.php
index 95c0e4f..c85aec8 100644
--- a/scripts/mail-weak-keys.php
+++ b/scripts/mail-weak-keys.php
@@ -18,7 +18,7 @@ You received this email because a certificate issued to you is vulnerable:
 Server Certificate, Serial $cert_serial, expiring $cert_expire, CN $cert_CN
 
 To rectify the problem CAcert will revoke all vulnerable certificates (including yours) on $action_date.
-CAcert will no longer accept vulnerable certificate requests for signing. In future all Certficate
+CAcert will no longer accept vulnerable certificate requests for signing. In future all Certificate
 Signing Requests must be backed by private keys with a key length at least 2048 bits and no other known vulnerabilities.
 
 You should submit a new Certificate Signing Request of acceptable strength as soon as possible
@@ -51,13 +51,13 @@ Client Certificate, Serial $cert_serial, expiring $cert_expire, CN $cert_CN
 
 To rectify the problem CAcert will revoke all vulnerable certificates (including yours) on $action_date.
 CAcert will no longer accept vulnerable certificate requests for signing. In future all
-client certficates must be backed by private keys with a key length at least 1024 bits
+client certificates must be backed by private keys with a key length at least 1024 bits
 and no other known vulnerabilities.
 
 This means that you should replace your current certificate with a new one of acceptable strength.
 If you use Firefox or Chrome, select 'Keysize: High Grade' before 'Create Certificate Request'.
 If you use Internet Explorer, select 'Microsoft Strong Cryptographic Provider'. If you select an
-option that generates a weak key (eg 'Microsoft Base Cryptographic Provider v1.0') your certficate
+option that generates a weak key (eg 'Microsoft Base Cryptographic Provider v1.0') your certificate
 request will be rejected.
 
 Kind regards
@@ -83,7 +83,7 @@ You received this email because a certificate issued to you is vulnerable:
 Organisation Server Certificate, Serial $cert_serial, expiring $cert_expire, CN $cert_CN
 
 To rectify the problem CAcert will revoke all vulnerable certificates (including yours) on $action_date.
-CAcert will no longer accept vulnerable certificate requests for signing. In future all Certficate
+CAcert will no longer accept vulnerable certificate requests for signing. In future all Certificate
 Signing Requests must be backed by private keys with a key length at least 2048 bits and no other known vulnerabilities.
 
 You should submit a new Certificate Signing Request of acceptable strength as soon as possible
@@ -116,13 +116,13 @@ Organisation Client Certificate, Serial $cert_serial, expiring $cert_expire, CN
 
 To rectify the problem CAcert will revoke all vulnerable certificates (including yours) on $action_date.
 CAcert will no longer accept vulnerable certificate requests for signing. In future all
-client certficates must be backed by private keys with a key length at least 1024 bits
+client certificates must be backed by private keys with a key length at least 1024 bits
 and no other known vulnerabilities.
 
 This means that you should replace your current certificate with a new one of acceptable strength.
 If you use Firefox or Chrome, select 'Keysize: High Grade' before 'Create Certificate Request'.
 If you use Internet Explorer, select 'Microsoft Strong Cryptographic Provider'. If you select an
-option that generates a weak key (eg 'Microsoft Base Cryptographic Provider v1.0') your certficate
+option that generates a weak key (eg 'Microsoft Base Cryptographic Provider v1.0') your certificate
 request will be rejected.
 
 Kind regards