diff options
| author | Michael Tänzer <neo@nhng.de> | 2012-12-10 00:08:33 +0100 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2012-12-10 00:08:33 +0100 |
| commit | ee8f25df194afec37acef984b9e1471ad1671658 (patch) | |
| tree | 9aa2a51840af7a7709dbe9327d9f20f50c0f59f3 /pages | |
| parent | 2f4fec0ca0ad646e595e30e9761be4c36d02cbb7 (diff) | |
| parent | c1fed4ce8bb0a08d1cba6ba0a95a4ecd3eff6ddb (diff) | |
| download | cacert-devel-ee8f25df194afec37acef984b9e1471ad1671658.tar.gz cacert-devel-ee8f25df194afec37acef984b9e1471ad1671658.tar.xz cacert-devel-ee8f25df194afec37acef984b9e1471ad1671658.zip | |
Merge remote-tracking branch 'origin/bug-1114' into release
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/account/40.php | 9 | ||||
| -rw-r--r-- | pages/index/11.php | 11 |
2 files changed, 2 insertions, 18 deletions
diff --git a/pages/account/40.php b/pages/account/40.php index b1a7fdb..4877d79 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -65,21 +65,14 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s </form> <p><b><?=_("Security Issues")?></b></p> -<p><? sprintf(_("Please use any of the following ways to report security ". +<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 %s. You can file a bugreport on %s and mark it as ". "private."), "<a href='mailto:support@cacert.org'>support@cacert.org</a>", "<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> -<p><?=_("Postal Address:")?><br> -CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia</p> <script type="text/javascript"> <!-- diff --git a/pages/index/11.php b/pages/index/11.php index 60c8941..01eca3a 100644 --- a/pages/index/11.php +++ b/pages/index/11.php @@ -65,16 +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><b><?=_("Snail Mail")?></b></p> -<p><?=_("Alternatively you can get in contact with us via the following methods:")?></p> - -<p><?=_("Postal Address:")?><br> -CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia</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> <script type="text/javascript"> <!-- |