From 57584dc4744fea59833ef355f7513690d246c70f Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 4 Oct 2011 18:25:23 -0400 Subject: more porting work --- .../template/en/default/account/prefs/securemail.html.tmpl | 10 ++++------ .../template/en/default/pages/securemail/help.html.tmpl | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'extensions/SecureMail/template') diff --git a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl index 2b643c961..dadfbb537 100644 --- a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl +++ b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl @@ -17,14 +17,12 @@ # Contributor(s): Max Kanat-Alexander #%] -

Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has -deemed 'secure'. This means emails containing information about those [% terms.bugs %] +

Some bugs in this [% terms.Bugzilla %] are in groups the administrator has +deemed 'secure'. This means emails containing information about those bugs will only be sent encrypted. Enter your PGP/GPG public key or -SMIME certificate here to receive full update emails for such [% terms.bugs %].

+SMIME certificate here to receive full update emails for such bugs.

-

If you are a member of a secure group, or if you enter a key here, your password reset email -will also be sent to you encrypted. If you are a member of a secure group and do not enter a key, -you will not be able to reset your password without the assistance of an administrator.

+

If you are a member of a secure group, or if you enter a key here, your password reset email will also be sent to you encrypted. If you are a member of a secure group and do not enter a key, you will not be able to reset your password without the assistance of an administrator.

More help is available.

diff --git a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl index 4e1a5c577..76525eac2 100644 --- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl +++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl @@ -24,12 +24,12 @@ title = "SecureMail Help" %] -[% terms.Bugzilla %] considers certain groups as "secure". If a [% terms.bug %] is in one of those groups, [% terms.Bugzilla %] -will not send unencrypted email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either +Bugzilla considers certain groups as "secure". If a bug is in one of those groups, Bugzilla will not send unencrypted +email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either a S/MIME or a GPG/PGP key on the SecureMail preferences tab.

In addition, if you have uploaded a S/MIME or GPG/PGP key using the -SecureMail preferences tab, if you request your password to be reset, [% terms.Bugzilla %] will send the reset email encrypted and you will +SecureMail preferences tab, if you request your password to be reset, Bugzilla will send the reset email encrypted and you will be required to decrypt it to view the reset instructions.

S/MIME

@@ -86,7 +86,7 @@ You’ll have to answer several questions:

gpg --armor --output pubkey.txt --export 'Your Name'

-

Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %]. +

Paste the contents of pubkey.txt into the SecureMail text field in Bugzilla.

  • Configure your email client to use your associated private key to decrypt the encrypted emails. For Thunderbird, you need the Enigmail extension.

    -- cgit v1.2.3-24-g4f1b