summaryrefslogtreecommitdiff
path: root/www
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 /www
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
Diffstat (limited to 'www')
-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
7 files changed, 9 insertions, 9 deletions
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)