summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Clausecker <fuzxxl@gmail.com>2012-11-11 23:20:56 +0100
committerBenny Baumann <BenBE@geshi.org>2012-11-20 20:22:36 +0100
commitb3e045362c56718f28014dc229d37a22acc3d0d7 (patch)
tree611d9da30686159a1e31305033695ac3f2f5621f
parent7baaa9a0ac611329539a43031ca3d0e81bba2b5f (diff)
downloadcacert-devel-bug-1113.tar.gz
cacert-devel-bug-1113.tar.xz
cacert-devel-bug-1113.zip
Bug #1113: Fix translation misspellingsbug-1113
Description: Change english textes according to the wiki page https://wiki.cacert.org/Software/TranslationMisspelling https://wiki.cacert.org/Software/TranslationMisspelling https://bugs.cacert.org/view.php?id=1113
-rw-r--r--includes/account.php8
-rw-r--r--includes/account_stuff.php2
-rw-r--r--includes/notary.inc.php2
-rw-r--r--pages/account/0.php8
-rw-r--r--pages/account/2.php2
-rw-r--r--pages/account/43.php2
-rw-r--r--pages/index/0.php8
-rw-r--r--pages/index/1.php2
-rw-r--r--pages/index/11.php4
-rw-r--r--pages/index/16.php2
-rw-r--r--pages/index/3.php2
-rw-r--r--pages/index/5.php2
-rw-r--r--pages/wot/3.php8
-rw-r--r--pages/wot/6.php4
-rw-r--r--www/advertising.php2
-rw-r--r--www/cap.html.php6
-rw-r--r--www/capnew.php2
-rw-r--r--www/coap.html.php2
-rw-r--r--www/coapnew.php2
-rw-r--r--www/index.php2
-rw-r--r--www/wot.php2
21 files changed, 37 insertions, 37 deletions
diff --git a/includes/account.php b/includes/account.php
index 4faa0e5..549c377 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -177,7 +177,7 @@
}
else
{
- echo _("You did not select any email accounts for removal.");
+ echo _("You did not select any email addresses for removal.");
}
if($delcount > 0)
{
@@ -339,7 +339,7 @@
{
$id = $oldid;
showheader(_("My CAcert.org Account!"));
- echo _("The challenge-response code of your certificate request did not match. Can't continue with certificaterequest.");
+ echo _("The challenge-response code of your certificate request did not match. Can't continue with certificate request.");
showfooter();
exit;
}
@@ -1206,7 +1206,7 @@
$_SESSION['_config']['user']['A3'] == $_SESSION['_config']['user']['A5'] ||
$_SESSION['_config']['user']['A4'] == $_SESSION['_config']['user']['A5'])
{
- $_SESSION['_config']['errmsg'] .= _("For your own security you must enter 5 different password questions and answers. You aren't allowed to duplicate questions, set questions as answers or use the question as the answer.")."<br>\n";
+ $_SESSION['_config']['errmsg'] .= _("For your own security you must enter 5 different secret questions and answers. You aren't allowed to duplicate questions, set questions as answers or use the question as the answer. The questions and answers must be unambiguous and easy to remember forever, that means permanent issues that never change, not current issues, even more no random strings.")."<br>\n";
$id = $oldid;
$oldid=0;
}
@@ -1500,7 +1500,7 @@
{
$id = $oldid;
showheader(_("My CAcert.org Account!"));
- echo _("The challenge-response code of your certificate request did not match. Can't continue with certificaterequest.");
+ echo _("The challenge-response code of your certificate request did not match. Can't continue with certificate request.");
showfooter();
exit;
}
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index 148a0ac..342ffa2 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -178,7 +178,7 @@ function hideall() {
?></ul>
</div>
<div class="relatedLinks">
- <h3 class="pointer" onclick="explode('emailacc')">+ <?=_("Email Accounts")?></h3>
+ <h3 class="pointer" onclick="explode('emailacc')">+ <?=_("Email Addresses")?></h3>
<ul class="menu" id="emailacc"><li><a href="account.php?id=1"><?=_("Add")?></a></li><li><a href="account.php?id=2"><?=_("View")?></a></li></ul>
</div>
<div class="relatedLinks">
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index cc0e0eb..172feb4 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -230,7 +230,7 @@
if ($support == "1")
{
?>
- <td class="DataTD"><strong><?=_("When")?></strong></td>
+ <td class="DataTD"><strong><?=_("When entered")?></strong></td>
<td class="DataTD"><strong><?=_("Email")?></strong></td>
<? } ?>
<td class="DataTD"><strong><?=_("Who")?></strong></td>
diff --git a/pages/account/0.php b/pages/account/0.php
index 84b581e..9c7475c 100644
--- a/pages/account/0.php
+++ b/pages/account/0.php
@@ -21,13 +21,13 @@
<p><?=_("If you would like to view news items or change languages you can click the logout or go home links. Go home doesn't log you out of the system, just returns you to the front of the website. Logout logs you out of the system.")?></p>
<H4><?=_("My Details")?></H4>
<p><?=_("In this section you will be able to edit your personal information (if you haven't been assured), update your pass phrase, and lost pass phrase questions. You will also be able to set your location for the Web of Trust, it also effects the email announcement settings which among other things can be set to notify you if you're within 200km of a planned assurance event. You'll also be able to set additional contact information when you become fully trusted, so others can contact you to meet up outside official events.")?></p>
-<h4><?=_("Email Accounts and Client Certificates")?></h4>
-<p><?=_("The email account section is for adding/updating/removing email accounts which can be used to issue client certificates against. The client certificate section steps you through generating a certificate signing request for one or more emails you've registered in the email account section.")?></p>
+<h4><?=_("Email Addresses and Client Certificates")?></h4>
+<p><?=_("The email address section is for adding/updating/removing email addresses which can be used to issue client certificates against. The client certificate section steps you through generating a certificate signing request for one or more email addressess you've registered in the email address section.")?></p>
<h4><?=_("Domains and Server Certificates.")?></h4>
-<p><?=_("Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 trust points, or 6 months for no trust points.")?></p>
+<p><?=_("Before you can start issuing certificates for your website, irc server, smtp server, pop3, imap etc you will need to add domains to your account under the domain menu. You can also remove domains from here as well. Once you've added a domain you are free then to go into the Server Certificate section and start pasting CSR into the website and have the website return you a valid certificate for up to 2 years if you have 50 assurance points, or 6 months for no assurance points.")?></p>
<h4><?=_("Org Client and Server Certificates")?></h4>
<p><?=_("Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.")?></p>
<h4><?=_("CAcert Web of Trust")?></h4>
-<p><?=_("The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.")?></p>
+<p><?=_("The Web of Trust system CAcert uses is similar to that many use that are involved with GPG/PGP. They hold face to face meetings to verify, if each others photo identity cards match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework. To gain trust in the system, you must first locate someone already trusted. The trust of a person depends on how many people they've trusted or met before and that will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up, you can show your ID documents and you will need to fill out a CAP form, which the person assuring your details must retain for later verification if needed.")?></p>
<p><b><?=_("The former TTP (Trusted Third Party) System has been stopped, and is currently not available.")?></b></p>
<? // "You can also get trust points via the Trust Third Party system where you go to a lawyer, bank manager, accountant, or public notary/juctise of the peace and they via your ID and fill in the TTP form to state they have viewed your ID documents and it appears authentic and true. More information on the TTP system can be found in the TTP sub-menu</p> ?>
diff --git a/pages/account/2.php b/pages/account/2.php
index 36421f9..7519af9 100644
--- a/pages/account/2.php
+++ b/pages/account/2.php
@@ -18,7 +18,7 @@
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
- <td colspan="4" class="title"><?=_("Email Accounts")?></td>
+ <td colspan="4" class="title"><?=_("Email Addresses")?></td>
</tr>
<tr>
<td class="DataTD"><?=_("Default")?></td>
diff --git a/pages/account/43.php b/pages/account/43.php
index 7bf6d04..983d53c 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -307,7 +307,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
while($drow = mysql_fetch_assoc($dres))
{ ?>
<tr>
- <td class="DataTD"><?=_("Secondary Emails")?>:</td>
+ <td class="DataTD"><?=_("Secondary Email Address")?>:</td>
<td class="DataTD"><?=sanitizeHTML($drow['email'])?></td>
</tr>
<? } ?>
diff --git a/pages/index/0.php b/pages/index/0.php
index d1d3fef..3a2f44e 100644
--- a/pages/index/0.php
+++ b/pages/index/0.php
@@ -17,10 +17,10 @@
*/ ?>
<h3><?=_("Are you new to CAcert?")?></h3>
-<p><?=sprintf(_("If you want to have free certificates issued to you, join the %s CAcert Community %s."),"<a href=\"https://www.cacert.org/index.php?id=1\">","</a>")?></p>
+<p><?=sprintf(_("If you want to have free certificates issued to you, join the %sCAcert Community%s."),"<a href=\"https://www.cacert.org/index.php?id=1\">","</a>")?></p>
-<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %s Root Distribution License %s."),'<a href="/policy/RootDistributionLicense.php">',"</a>")?>
-<?=sprintf(_("This license applies to using the CAcert %s root keys %s."),'<a href="/index.php?id=3">','</a>')?></p>
+<p><?=sprintf(_("If you want to use certificates issued by CAcert, read the CAcert %sRoot Distribution License%s."),'<a href="/policy/RootDistributionLicense.php">',"</a>")?>
+<?=sprintf(_("This license applies to using the CAcert %sroot keys%s."),'<a href="/index.php?id=3">','</a>')?></p>
<? if(!array_key_exists('mconn',$_SESSION) || !$_SESSION['mconn']) echo "<font size='+1'>"._("Most CAcert functions are currently unavailable. Please come back later.")."</font>";?>
@@ -141,7 +141,7 @@
</form>
<p><?=_("If you are located in Australia, you can use bank transfer instead and pay the equivalent of US$10 in AU$.")?></p>
-<p><?=_("Please also include Your name in the transaction so we know who it came from or send an email to robert at cacert dot org with the details:")?></p>
+<p><?=_("Please also include Your name in the transaction so we know who it came from or send an email to treasurer at cacert dot org with the details:")?></p>
<ul>
<li>Account Name: CAcert Inc</li>
diff --git a/pages/index/1.php b/pages/index/1.php
index a60a242..1aa7c1b 100644
--- a/pages/index/1.php
+++ b/pages/index/1.php
@@ -103,7 +103,7 @@
</tr>
<tr>
- <td class="DataTD" colspan="3"><?=_("Lost Pass Phrase Questions - Please enter five questions and your responses to be used for security verification.")?></td>
+ <td class="DataTD" colspan="3"><?=_("Lost Pass Phrase Questions - Please enter five questions and your responses to be used for security verification. The questions and answers must be unambiguous and easy to remember forever, that means permanent issues that never change, not current issues, even more no random strings.")?></td>
</tr>
<tr>
diff --git a/pages/index/11.php b/pages/index/11.php
index 60c8941..c848532 100644
--- a/pages/index/11.php
+++ b/pages/index/11.php
@@ -24,7 +24,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
<p><b><?=_("If you are contacting us about advertising, please use the form at the bottom of the website, the first contact form is not the correct place.")?></b></p>
<p><?=sprintf(_("If you are having trouble with your username or password, please visit our %swiki page%s for more information"), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount' target='_new'>", "</a>");?></p>
<p><?=_("Before contacting us, be sure to read the information on our official and unofficial HowTo and FAQ pages.")?> - <a href="//wiki.cacert.org/HELP/"><?=_("Go here for more details.")?></a></p>
-<p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
+<p><?=_("General questions about CAcert should be sent to the support mailing list. This list has many more volunteers then those directly involved with the running of the website. Please send all mails preferably in English or German, since we have rather few people speaking other languages. Nearly everyone on the mailing list understands English and many German. This will increase your chance for a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
<p><a href="https://lists.cacert.org/wws/info/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
<p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
<form method="post" action="index.php" name="form1">
@@ -65,7 +65,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s
</form>
<p><b><?=_("Security Issues")?></b></p>
-<p><?=_("Please use any of the following ways to report security issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on <a href='https://bugs.cacert.org/'>bugs.cacert.org</a> and mark it as private.")?></p>
+<p><?=sprintf(_("Please use any of the following ways to report security issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on %s and mark it as private."),"<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p>
<p><b><?=_("Snail Mail")?></b></p>
<p><?=_("Alternatively you can get in contact with us via the following methods:")?></p>
diff --git a/pages/index/16.php b/pages/index/16.php
index c2cb391..36c2b7a 100644
--- a/pages/index/16.php
+++ b/pages/index/16.php
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
+<p><?=sprintf(_("You are bound by the %sRoot Distribution Licence%s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
<p>
Class 1 <?=_("PKI Key")?><br>
diff --git a/pages/index/3.php b/pages/index/3.php
index c2cb391..36c2b7a 100644
--- a/pages/index/3.php
+++ b/pages/index/3.php
@@ -16,7 +16,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
+<p><?=sprintf(_("You are bound by the %sRoot Distribution Licence%s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p>
<p>
Class 1 <?=_("PKI Key")?><br>
diff --git a/pages/index/5.php b/pages/index/5.php
index 20e868f..152883a 100644
--- a/pages/index/5.php
+++ b/pages/index/5.php
@@ -53,7 +53,7 @@
</table>
<input type="hidden" name="oldid" value="<?=$id?>">
</form>
-<p><?=_("Due to the increasing number of people that haven't been able to recover their passwords via the lost password form, there are now two other options available. 1.) If you don't care about your account you can signup under a new account and file dispute forms to recover your email accounts and domains. 2.) If you would like to recover your password via help from support staff, this requires a small payment to cover a real person's time to verify your claim of ownership on an account. After you pay the required fee you will have to contact the proper person to arrange the verification. Click the payment button below to continue.")." "?><? printf(_("Alternatively visit our %sinformation page%s on this subject for more details."), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount'>", "</a>")?></p>
+<p><?=_("Due to the increasing number of people that haven't been able to recover their passwords via the lost password form, there are now two other options available. 1.) If you don't care about your account you can signup under a new account and file dispute forms to recover your email accounts and domains. 2.) Password reset with assurance. Look for an assurer and agree with him a password. He reports it to Support and Support sets a new password combination for you. 3.) If you would like to recover your password via help from support staff, this requires a small payment to cover a real person's time to verify your claim of ownership on an account. After you pay the required fee you will have to contact the proper person to arrange the verification. Click the payment button below to continue.")." "?><? printf(_("Alternatively visit our %sinformation page%s on this subject for more details."), "<a href='http://wiki.cacert.org/wiki/FAQ/LostPasswordOrAccount'>", "</a>")?></p>
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick">
diff --git a/pages/wot/3.php b/pages/wot/3.php
index 0864ffd..c0ac1ae 100644
--- a/pages/wot/3.php
+++ b/pages/wot/3.php
@@ -22,8 +22,8 @@
<p><?=_("Contact")?><br>
<br>
* <?=_("You must meet the applicant in person;")?><br>
-* <?=_("You must sight at least one form of government issued photo identification. It's preferable if 2 forms of Government issued photo ID are presented, as less points may be issued if there is any doubt on the person by the person issuing points;")?><br>
-* <?=_("Complete the assurance form if the applicant has not already done so. Ensure that all information matches.")?><br>
+* <?=_("You must sight at least one form of government issued photo identification. It's preferable if 2 forms of Government issued photo ID are presented, as less points may be issued if there is any doubt on the person by the person issuing points;")?><br>
+* <?=_("Complete the assurance form if the applicant has not already done so. Ensure that all information matches.")?><br>
</p>
<p><?=_("Processing")?><br>
@@ -31,7 +31,7 @@
<br>
* <?=_("Enter the applicant's email address;")?><br>
* <?=_("Compare the online information to the information recorded on the paper form;")?><br>
-* <?=_("If, and only if, the two match completely - you may award trust points up to the maximum points you are able to allocate;")?><br>
+* <?=_("If, and only if, the two match completely, you may award assurance points up to the maximum points you are able to allocate;")?><br>
</p>
<p><?=_("Privacy")?><br>
@@ -44,4 +44,4 @@
<?=_("A CAcert Assurer who knowingly, or reasonably ought to have known, assures an applicant contrary to this policy may be held liable.")?></p>
<p><?=_("Assurance Points")?><br>
-<?=_("CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change. We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of CAcert require this.")?></p>
+<?=_("CAcert may, from time to time, alter the amount of Assurance Points that a class of assurer may assign as is necessary to effect a policy or rule change. We may also alter the amount of Assurance Points available to an individual, or new class of assurer, should another policy of CAcert require this.")?></p>
diff --git a/pages/wot/6.php b/pages/wot/6.php
index 28c1875..5aad27d 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -53,7 +53,7 @@
AssureBoxLine("rules",_("I have read and understood the Assurance Policy and the Assurance Handbook and am making this Assurance subject to and in compliance with the policy and handbook."),array_key_exists('rules',$_POST) && $_POST['rules'] == 1);
AssureTextLine(_("Policy"),"<a href=\"/policy/AssurancePolicy.php\" target=\"_blank\">"._("Assurance Policy")."</a> - <a href=\"http://wiki.cacert.org/AssuranceHandbook2\" target=\"_blank\">"._("Assurance Handbook")."</a>");
AssureInboxLine("points",_("Points"),"","<br />(Max. ".maxpoints().")");
- AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"),$fname));
- AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"));
+ AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s agreed to the %s"),$fname,"<a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"));
+ AssureCCABoxLine("CCAAgree",sprintf(_("Check this box only if YOU agree to the %s"),"<a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community Agreement</a>"));
AssureFoot($id,_("I confirm this Assurance"));
?>
diff --git a/www/advertising.php b/www/advertising.php
index 43e4f93..053505b 100644
--- a/www/advertising.php
+++ b/www/advertising.php
@@ -78,7 +78,7 @@
unset($title);
unset($months);
$id = 1;
- $errmsg = _("Your advertisement request has been lodge in the system and administrators notified. Once the information has been reviewed, you will be notified if the link was acceptable or declined and the reason for the decline. If the request is successful the system will generate an invoice.");
+ $errmsg = _("Your advertisement request has been lodged in the system and administrators notified. Once the information has been reviewed, you will be notified if the link was acceptable or declined and the reason for the decline. If the request is successful, the system will generate an invoice.");
}
showheader(_("CAcert.org Advertising Section"));
diff --git a/www/cap.html.php b/www/cap.html.php
index cc3fad6..9031d49 100644
--- a/www/cap.html.php
+++ b/www/cap.html.php
@@ -23,7 +23,7 @@
echo '<head>', "\n";
echo '<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">', "\n";
- echo '<title>'._("Identity Verification Form (CAP) form").'</title>', "\n";
+ echo '<title>'._("CAcert Assurance Program (CAP) form").'</title>', "\n";
echo '</head>', "\n";
echo '<body>', "\n";
@@ -36,7 +36,7 @@
echo '<big><big><span style="font-weight: bold;">'._("CAcert Assurance Programme").'</span></big></big><br>', "\n";
echo '</div>', "\n";
echo '<div style="text-align: right;">', "\n";
- echo '<big><big><span style="font-weight: bold;">'._("Identity Verification Form (CAP) form").'</span></big></big><br>', "\n";
+ echo '<big><big><span style="font-weight: bold;">'._("CAcert Assurance Program (CAP) form").'</span></big></big><br>', "\n";
echo '</div>', "\n";
echo '<div style="text-align: right;">'.'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - <a href="http://www.cacert.org/"> http://www.cacert.org/</a><br></div>', "\n";
@@ -60,7 +60,7 @@
echo _("The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face to face witnessing of government-issued photo identity documents.");
echo _("The Applicant asks the Assurer to verify to the CAcert Community that the Assurer has met and verified the Applicant's identity against original documents.");
echo _("Assurer may leave a copy of the details with the Applicant, and may complete and sign her final form after the meeting.");
- echo _("If there are any doubts or concerns about the Applicant's identity, do not allocate points. You are encouraged to perform a mutual Assurance.");
+ echo _("If there are any doubts or concerns about the Applicant's identity, do not allocate points. You are encouraged to perform a mutual Assurance.");
echo '<br>', "\n";
echo _("For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit:");
echo ' <a href="http://www.cacert.org/">http://www.cacert.org/</a><br>', "\n";
diff --git a/www/capnew.php b/www/capnew.php
index 41a0894..ba16d72 100644
--- a/www/capnew.php
+++ b/www/capnew.php
@@ -833,7 +833,7 @@ class CAPPDF extends TCPDF {
/*private*/ function PrintCAP($assuree = NULL, $assurer = NULL, $assurance = NULL, $page = NULL ) {
$this->SetCol();
- $this->PrintHeader($this->unhtmlentities( _('CAcert Assurance Programme') ), $this->unhtmlentities( _('Identity Verification Form (CAP) form') ), defined('ASSCAP')?ASSCAP:'',defined('WEB')? WEB.substr(__FILE__, strrpos(__FILE__,'/')) : '');
+ $this->PrintHeader($this->unhtmlentities( _('CAcert Assurance Programme') ), $this->unhtmlentities( _('CAcert Assurance Program (CAP) form') ), defined('ASSCAP')?ASSCAP:'',defined('WEB')? WEB.substr(__FILE__, strrpos(__FILE__,'/')) : '');
// define slightly different footer message
$this->myFooter('V'. substr($this->Version(), 0, strpos($this->Version(), '.')).', '. $this->unhtmlentities( _('generated') ).' '.date('Y-n-j'), NULL);
$this->AssuranceInfo($assurance);
diff --git a/www/coap.html.php b/www/coap.html.php
index 8c2479c..3221d95 100644
--- a/www/coap.html.php
+++ b/www/coap.html.php
@@ -70,7 +70,7 @@ table#TAB1 td { border: 0 }
</table>
<p>
<?php
- echo _("The CAcert Organisation Programme (COAP) aims to verify the identity of the organisation."), "<br>\n";
+ echo _("The CAcert Organisation Assurance Programme (COAP) aims to verify the identity of the organisation."), "<br>\n";
echo _("The Applicant asks the Organisation Assurer to verify to CAcert Community that the information provided by the Applicant is correct, and according to the official trade office registration bodies."), "<br>\n";
echo _("For more information about the CAcert Organisation Assurance Programme, including detailed guides to CAcert Organisation Assurers, please visit:"), ' ';
echo ' <a href="http://www.cacert.org/">http://www.cacert.org</a><br>';
diff --git a/www/coapnew.php b/www/coapnew.php
index 4f69247..88658c0 100644
--- a/www/coapnew.php
+++ b/www/coapnew.php
@@ -973,7 +973,7 @@ class COAPPDF extends TCPDF {
$this->Bookmark($this->unhtmlentities( _('CAcert COAP form') ),0,$this->S($this->GetY()));
// Show text blurb at top of page
- $strg = $this->unhtmlentities( _('The CAcert Organisation Programme (COAP) aims to verify the identity of the organisation.') );
+ $strg = $this->unhtmlentities( _('The CAcert Organisation Assurance Programme (COAP) aims to verify the identity of the organisation.') );
$strg .= "\r\n". $this->unhtmlentities( _('The Applicant asks the Organisation Assurer to verify to CAcert Community that the information provided by the Applicant is correct, and according to the official trade office registration bodies.') );
$cellcnt += $this->PrintInfo( $strg, defined('ASSINTRO')? ASSINTRO:"");
$cellcnt += $this->PrintInfo( $this->unhtmlentities( _('For more information about the CAcert Organisation Assurance Programme, including detailed guides to CAcert Organisation Assurers, please visit:')." ".WEB, defined('ASSCOAP')?ASSCOAP:"") );
diff --git a/www/index.php b/www/index.php
index 41b6d7a..355a960 100644
--- a/www/index.php
+++ b/www/index.php
@@ -417,7 +417,7 @@ require_once('../includes/lib/l10n.php');
$_SESSION['signup']['A4'] == $_SESSION['signup']['A5'])
{
$id = 1;
- $_SESSION['_config']['errmsg'] .= _("For your own security you must enter 5 different password questions and answers. You aren't allowed to duplicate questions, set questions as answers or use the question as the answer.")."<br>\n";
+ $_SESSION['_config']['errmsg'] .= _("For your own security you must enter 5 different secret questions and answers. You aren't allowed to duplicate questions, set questions as answers or use the question as the answer. The questions and answers must be unambiguous and easy to remember forever, that means permanent issues that never change, not current issues, even more no random strings.")."<br>\n";
}
if($_SESSION['signup']['Q1'] == "" || $_SESSION['signup']['Q2'] == "" ||
diff --git a/www/wot.php b/www/wot.php
index c6c0568..b4a15e3 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -328,7 +328,7 @@ $iecho= "c";
if(($drow['total'] + $newpoints) < 100 && ($drow['total'] + $newpoints) >= 50)
{
- $body .= _("You now have over 50 points, and can now have your name added to client certificates, and issue server certificates for up to 2 years.")."\n\n";
+ $body .= _("You now have over 50 points, and can now have your name added to client certificates and can issue certificates for up to 2 years.")."\n\n";
}
if(($drow['total'] + $newpoints) >= 100 && $newpoints > 0)