diff options
| author | Benny Baumann <BenBE@geshi.org> | 2015-06-23 22:40:52 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2015-06-23 22:40:52 +0200 |
| commit | 03cb079aba82af5f627f9c2de7b486aff3b1e26b (patch) | |
| tree | c9223945993a9743a2fe71f451ebe9ae72f7630f | |
| parent | de1eeb532805380bf7a747582c94fdfc62ce3401 (diff) | |
| parent | 3db97e4e1734de5e04b52ad5158e5aed0915ac4e (diff) | |
| download | cacert-devel-03cb079aba82af5f627f9c2de7b486aff3b1e26b.tar.gz cacert-devel-03cb079aba82af5f627f9c2de7b486aff3b1e26b.tar.xz cacert-devel-03cb079aba82af5f627f9c2de7b486aff3b1e26b.zip | |
Merge branch 'bug-1379' into testserver-stable
| -rw-r--r-- | includes/general_stuff.php | 2 | ||||
| -rw-r--r-- | pages/account/6.php | 5 | ||||
| -rw-r--r-- | pages/index/13.php | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 19c3d2f..08eb807 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -66,7 +66,7 @@ google_color_border = "FFFFFF"; </div> <? if(array_key_exists('mconn',$_SESSION) && $_SESSION['mconn']) { ?> <div class="relatedLinks"> - <h3 class="pointer" onclick="explode('recom')"><?=_("Advertising")?></h3> + <h3 class="pointer" onclick="explode('recom')">Funding</h3> <ul class="menu" id="recom"><? $query = "select * from `advertising` where `expires`>NOW() and `active`=1"; $res = mysql_query($query); diff --git a/pages/account/6.php b/pages/account/6.php index fc21d39..2719e27 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -97,6 +97,11 @@ if (array_key_exists('format', $_REQUEST)) { } else { showheader(_("My CAcert.org Account!"), _("Install your certificate")); + + echo '<p>'.sprintf(_('Find the signed certificate together with links for download below. Depending on the way your key was generated you will need to either import the certificate into your browser and export the combined key from there, or save the certificate and combine it with your key file using a tool like OpenSSL or XCA. More information is available in the %sWiki%s.'), '<a href="https://wiki.cacert.org/HowToDocuments/InstallClientCertificate" target="_blank">','</a>').'</p>'; + + echo '<p>'.sprintf(_('Nota bene: We need your support to keep our services operational. Please consider to %sdonate%s or support our teams with your work.'), '<a href="https://funding.cacert.org" target="_blank">','</a>').'</p>'; + echo '<ul class="no_indent">'; echo "<li><a href='account.php?id=$id&cert=$certid&install'>". _("Install the certificate into your browser"). diff --git a/pages/index/13.php b/pages/index/13.php index 612422f..5c2c97e 100644 --- a/pages/index/13.php +++ b/pages/index/13.php @@ -44,6 +44,8 @@ Account No.: 180264 <p><?=_("Thank you very much for your support, your donations help CAcert to continue to operate.")?></p> +<h3>Funding</h3> +<p><?=sprintf(_("If you want to support some special funding projects please visit the %sfunding page%s."), '<a href="https://funding.cacert.org" target="_blank">','</a>')?></p> <h3><?=_("Using Our Affiliate Partners")?></h3> |