summaryrefslogtreecommitdiff
path: root/pages/gpg
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-07-14 22:23:52 +0200
committerBenny Baumann <BenBE@geshi.org>2013-07-14 22:35:10 +0200
commit75693292de2d907bf2a4b0f12abd7cd68781f95a (patch)
tree918d60a3ffdf5da339aa53ea3556b2bae252d2a2 /pages/gpg
parent5ce73fd94b81c9444164815236e9d545635d7fda (diff)
downloadcacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.tar.gz
cacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.tar.xz
cacert-devel-75693292de2d907bf2a4b0f12abd7cd68781f95a.zip
bug 1123: fixed merge conflicts on testserver
Diffstat (limited to 'pages/gpg')
-rw-r--r--pages/gpg/0.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/pages/gpg/0.php b/pages/gpg/0.php
index 60b1784..c513793 100644
--- a/pages/gpg/0.php
+++ b/pages/gpg/0.php
@@ -19,6 +19,8 @@
?>
<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 />
+ <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 />
<?=_("Please Note: You need to accept the CCA to proceed.")?></p>